X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=a451e8926021283ef7b8092e1608562ff31fe338;hp=f7c7f1be4e65a87dc6b5b0d8fbb21232911e265f;hb=b8bc24e242b088195249574bb90cda2e1ee1d9e4;hpb=d041f4528426640d73d141cec7fd2576f7e8be84

diff --git a/Makefile.in b/Makefile.in
index f7c7f1be..a451e892 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,6 +51,7 @@ CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
+CPPFLAGS += -Wshadow
 
 BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter para_write $(extra_binaries)
 
@@ -89,9 +90,11 @@ tarball_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
 tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 
-.PHONY: clean distclean maintainer-clean install html www tags ChangeLog doxygen
+.PHONY: clean distclean maintainer-clean install html www tags ChangeLog doxygen gruta
 all: $(BINARIES)
 www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen doc
+gruta: $(gen_html) $(gruta_html)
+
 
 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
@@ -99,7 +102,6 @@ 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 fd.o
 
 *.o: para.h config.h gcc-compat.h
 
@@ -143,7 +145,13 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	case $< in client.ggo) O="--unamed-opts=command";; \
 		audioc.ggo) O="--unamed-opts=command";; \
 	esac; \
-	gengetopt $$O --conf-parser --file-name=$(*F).cmdline --set-package="para_$(subst .cmdline,,$(*F))" --set-version="$V"  < $<
+	gengetopt $$O \
+		--conf-parser \
+		--file-name=$(*F).cmdline \
+		--func-name $(*F)_cmdline_parser \
+		--arg-struct-name=$(*F)_args_info \
+		--set-package="para_$(subst .cmdline,,$(*F))" \
+		--set-version="$V"  < $<
 
 aacdec.o: aacdec.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
@@ -186,8 +194,8 @@ para_gui: @gui_objs@
 para_audiod: @audiod_objs@
 	$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
 
-para_audioc: $(audioc_objs)
-	$(CC) -o $@ $(audioc_objs)
+para_audioc: @audioc_objs@
+	$(CC) -o $@ @audioc_objs@
 
 para_dbadm: $(dbadm_objs)
 	$(CC) -o $@ $(dbadm_objs) -lncurses -lmenu
@@ -247,7 +255,7 @@ install: all
 ChangeLog:
 	para_util changelog > $@
 web/%.in.html: %
-	grutatxt -nb < $< > $@
+	grutatxt -nb  < $< > $@
 tags:
 	rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
 doc: