update to autoconf-2.60

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2bb28e904abe1c1ef7e73911ddbfad7a478571b1..9005d53c23bb9a3337688a2073ad97ab7782c712 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ VARDIR = /var/paraslash
 PKGDATADIR = @datadir@/@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@
@@ -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)
 
@@ -101,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
 
@@ -145,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@ $<
@@ -188,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