X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=2aece7ceb5013a5e7bdfc1af7df2540a1487ac85;hp=bf571ef4d7d4b0c417abe5a051ad989c665e1deb;hb=4a0a124cb7c207fe03bdc029261d200ab5b81268;hpb=d0557ca0ee0c39111c5e9f69121d69a2d26b8ed6

diff --git a/Makefile.in b/Makefile.in
index bf571ef4..2aece7ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,20 +6,16 @@ exec_prefix = @exec_prefix@
 
 BINDIR = @bindir@
 VARDIR = /var/paraslash
-PKGDATADIR = @datadir@/@PACKAGE_NAME@
+PKGDATADIR = @datarootdir@/@PACKAGE_NAME@
 FONTDIR = $(PKGDATADIR)/fonts
 PICDIR = $(PKGDATADIR)/pics
-MANDIR = @prefix@/share/man/man1
+MANDIR = @datarootdir@/man/man1
 
 install_sh = @install_sh@
-SSL_LIBS = @SSL_LIBS@
-SSL_LDFLAGS = @SSL_LDFLAGS@
 
-extra_binaries = @extra_binaries@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-version = @PACKAGE_VERSION@
 codename = oriented abstraction
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
@@ -45,14 +41,14 @@ CPPFLAGS += -DFONTDIR='"$(PKGDATADIR)/fonts"'
 CPPFLAGS += -DPICDIR='"$(PKGDATADIR)/pics"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DSYSTEM='"$(system)"'
-CPPFLAGS += -DVERSION='"$(version)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 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)
+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)
@@ -144,7 +140,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@ $<