X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=e01f93639b8725b4cdc3d11a51441292ffb0f5a2;hp=6d3d39816497aebdfc169790246dc6850df0beb4;hb=a4dbed1c3c7fb8b1b334aa62edcd8d673b3d18b2;hpb=63afe815dbecded66415b041a98c5bc1b060dc95

diff --git a/Makefile.in b/Makefile.in
index 6d3d3981..e01f9363 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 # CPPFLAGS += -Wfloat-equal
 # CPPFLAGS += -Wmissing-format-attribute
 # CPPFLAGS += -Wunused-macros
+# CPPFLAGS += -Wwrite-strings
 
 # invalid option for gcc-3.3.5
 # CPPFLAGS += -Wextra
@@ -87,7 +88,8 @@ web_misc := $(patsubst %,web/sync/%,$(web_misc))
 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
+	grab_client.h error.h net.h ringbuffer.h daemon.h string.h ipc.h dccp.h \
+	fd.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) \
@@ -99,40 +101,43 @@ 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
-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
+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
+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
+play_objs = play.cmdline.o play.o time.o fd.o
 
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
 
 V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
-module_ggo_opts := --set-version="" --set-package=""
+module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
 
 grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	gengetopt $(module_ggo_opts) \
-		--no-handle-error \
+		--set-package=grab \
 		--no-handle-help \
+		--no-handle-error \
+		--no-handle-version \
 		--arg-struct-name=grab_client_args_info \
 		--file-name=$(subst .ggo,,$<).cmdline \
 		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
-	grep -v 'fprintf\ *(stderr' $(subst .ggo,,$<).cmdline.c > $(subst .ggo,,$<).tmp
-	mv $(subst .ggo,,$<).tmp $(subst .ggo,,$<).cmdline.c
-	ggo_help GRAB_HELP_TXT < grab_client.ggo >> $(subst .ggo,,$<).cmdline.h
 
 %_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
 	gengetopt $(module_ggo_opts) \
+		--set-package=$(subst .ggo,,$<) \
+		--arg-struct-name=$(subst .ggo,,$<)_args_info \
 		--file-name=$(subst .ggo,,$<).cmdline \
 		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
 
 %_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
 	gengetopt $(module_ggo_opts) \
+		--set-package=$(subst .ggo,,$<) \
+		--arg-struct-name=$(subst .ggo,,$<)_args_info \
 		--file-name=$(subst .ggo,,$<).cmdline \
 		--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
 
@@ -170,8 +175,8 @@ para_slider: $(slider_objs)
 para_client: $(client_objs)
 	$(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) -lreadline -lncurses $(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@
@@ -216,7 +221,7 @@ maintainer-clean: distclean
 
 install: all
 	umask 022 && \
-	mkdir -p $(BINDIR) $(VARDIR) $(VARDIR)/fifo && \
+	mkdir -p $(BINDIR) $(VARDIR) && \
 	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
 	mkdir -p $(CONFDIR) && \
 	$(install_sh) -m 644 bash_completion $(sample_conf) $(CONFDIR)