X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=a6d55d410db7287ba7fc707cb7b923ab79bfe372;hp=d424c5388ffc0a8baaefd2714d34a6faa9468c06;hb=c9d743cd9a0ac9788884fafd70e6cf5e78941290;hpb=d7cda933daa35663b2b9b61d62cb514afa37fd18

diff --git a/Makefile.in b/Makefile.in
index d424c538..a6d55d41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 
-BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter $(extra_binaries)
+BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter para_write $(extra_binaries)
 
 FONTS := $(wildcard fonts/*.png)
 PICS := $(wildcard pics/paraslash/*.jpg)
@@ -89,7 +89,7 @@ misc := bash_completion
 headers := para.h server.h SFont.h crypt.h list.h http.h send.h ortp.h rc4.h \
 	close_on_fork.h afs.h db.h gcc-compat.h recv.h filter.h audiod.h \
 	grab_client.h error.h net.h ringbuffer.h daemon.h string.h ipc.h dccp.h \
-	fd.h
+	fd.h write.h write_common.h
 scripts := install-sh configure
 autocrap := Makefile.in config.h.in configure.ac autogen.sh
 tarball := web/sync/doc pics fonts $(c_sources) $(sample_conf) $(headers) \
@@ -101,8 +101,6 @@ all: $(BINARIES)
 www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
 
 client_objs = client.cmdline.o client.o net.o string.o crypt.o
-gui_objs = gui.cmdline.o gui.o gui_common.o exec.o close_on_fork.o signal.o \
-	string.o gui_theme.o stat.o ringbuffer.o fd.o
 sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o \
 	close_on_fork.o string.o stat.o fd.o
 dbadm_objs = dbadm.o exec.o close_on_fork.o string.o
@@ -110,7 +108,6 @@ fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o
 krell_objs = krell.o string.o
 slider_objs = slider.o string.o
 audioc_objs = audioc.cmdline.o audioc.o string.o net.o fd.o
-play_objs = play.cmdline.o play.o time.o fd.o
 
 *.o: para.h config.h gcc-compat.h
 
@@ -175,10 +172,10 @@ para_slider: $(slider_objs)
 	$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
 
 para_client: $(client_objs)
-	$(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) -lreadline -lncurses $(SSL_LIBS)
+	$(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) $(SSL_LIBS)
 
-para_gui: $(gui_objs)
-	$(CC) -o $@ $(gui_objs) -lncurses
+para_gui: @gui_objs@
+	$(CC) -o $@ @gui_objs@ -lncurses
 
 para_audiod: @audiod_objs@
 	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
@@ -198,11 +195,8 @@ para_server: @server_objs@
 para_sdl_gui: $(sdl_gui_objs)
 	$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
 
-para_play: $(play_objs)
-	$(CC) -o $@ $(play_objs) -lasound
-
-para_compress: $(compress_objs)
-	$(CC) -o $@ $(compress_objs)
+para_write: @write_objs@
+	$(CC) -o $@ @write_objs@ @write_ldflags@
 
 para_krell.so: $(krell_objs)
 	$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared