X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=cc8ff2f864aafcd02d75f02f0b71ae142c79318b;hp=2c64d19dd692f262ebebe52044679ca033c43062;hb=6924fdc9b5e93348c84960f1a4e140486a843d6a;hpb=f2a7b00cf72104a38733b7bf3add9fb19dd71c93

diff --git a/Makefile.in b/Makefile.in
index 2c64d19d..cc8ff2f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,17 +25,12 @@ codename = oriented abstraction
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 
-# produces lots of warnings on older debian systems with gcc-2.95.4
-# DEBUG_CPPFLAGS += -Wredundant-decls
+DEBUG_CPPFLAGS += -Wredundant-decls
 
 # produces false positives
 # DEBUG_CPPFLAGS += -Wunreachable-code
 
-# invalid options for gcc-2.95.4
-# CPPFLAGS += -Wfloat-equal
-# CPPFLAGS += -Wmissing-format-attribute
-# CPPFLAGS += -Wunused-macros
-# CPPFLAGS += -Wwrite-strings
+#CPPFLAGS += -Wwrite-strings
 
 # invalid option for gcc-3.3.5
 # CPPFLAGS += -Wextra
@@ -55,13 +50,14 @@ CPPFLAGS += -DVERSION='"$(version)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
+CPPFLAGS += -Wmissing-format-attribute
+CPPFLAGS += -Wunused-macros
 
-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)
 MANS := $(wildcard doc/man/man1/*.1)
-sample_conf := $(wildcard *.conf.sample)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
@@ -89,10 +85,10 @@ 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) \
+tarball := web/sync/doc pics fonts $(c_sources) $(headers) \
 	$(misc) $(grutatxt) $(gengetopts) $(autocrap) $(gengetopts_c) $(gengetopts_h) \
 	$(scripts)
 
@@ -101,16 +97,13 @@ 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
 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
-play_objs = play.cmdline.o play.o time.o
+audioc_objs = audioc.cmdline.o audioc.o string.o net.o fd.o
 
 *.o: para.h config.h gcc-compat.h
 
@@ -149,11 +142,6 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	esac; \
 	gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V"  < $<
 
-ortp_send.o: ortp_send.c
-	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ $<
-ortp_recv.o: ortp_recv.c
-	$(CC) -c -Wall -o $@ -g @GLIB_CFLAGS@ $<
-
 para_recv: @recv_objs@
 	$(CC) @recv_objs@ -o $@ @recv_ldflags@
 
@@ -175,10 +163,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 +186,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
@@ -226,7 +211,7 @@ install: all
 	mkdir -p $(BINDIR) $(VARDIR) && \
 	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
 	mkdir -p $(CONFDIR) && \
-	$(install_sh) -m 644 bash_completion $(sample_conf) $(CONFDIR)
+	$(install_sh) -m 644 bash_completion $(CONFDIR)
 	mkdir -p $(FONTDIR) && \
 	$(install_sh) -m 644 $(FONTS) $(FONTDIR) && \
 	mkdir -p $(PICDIR) && \