X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=1563739bfa50cd9c47cda249057a986e83b53668;hp=7ee2132b0d83f2cd895ff6fdbab00e941140a6dd;hb=ebe54cf6ee1b9c5daf7837cb618c299a5b5187e0;hpb=7420c57d8c93bacae510110b7956a0dd90abc86c

diff --git a/Makefile.in b/Makefile.in
index 7ee2132b..1563739b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := probabilistic parity
+codename := elliptic inheritance
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -23,6 +23,7 @@ DEBUG_CPPFLAGS += -Wredundant-decls
 # invalid option for gcc-3.3.3
 # DEBUG_CPPFLAGS += -Wextra
 # DEBUG_CPPFLAGS += -Wold-style-definition
+# DEBUG_CPPFLAGS += -Wdeclaration-after-statement
 
 # many warnings about trivial stuff
 # CPPFLAGS += -Wconversion
@@ -45,6 +46,7 @@ CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-format-attribute
+CPPFLAGS += -Wmissing-noreturn
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
@@ -53,7 +55,7 @@ CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
 
 BINARIES = para_server para_client para_audioc para_recv \
-	para_filter para_write para_fsck @extra_binaries@
+	para_filter para_write para_fsck para_afh @extra_binaries@
 man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
@@ -72,9 +74,6 @@ all: $(BINARIES) $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
-fade_objs := fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o
-fsck_objs := osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o
-
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
@@ -116,6 +115,9 @@ 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";; \
 		fsck.ggo) O="--unamed-opts=table";; \
+		afh.ggo) O="--unamed-opts=audio_file";; \
+		filter.ggo) O="--no-handle-help";; \
+		write.ggo) O="--no-handle-help";; \
 	esac; \
 	if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
 	gengetopt $$O \
@@ -136,12 +138,20 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 server_command_lists = server_command_list.man afs_command_list.man
 man/man1/para_server.1: para_server $(server_command_lists)
 	mkdir -p man/man1
-	opts="-N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \
+	opts="-h --detailed-help -N `for i in $(server_command_lists); do printf "%s\n" "-i $$i"; done`"; \
 	help2man $$opts ./para_server > $@
 
 man/man1/para_audiod.1: para_audiod audiod_command_list.man
 	mkdir -p man/man1
-	help2man -N -i audiod_command_list.man ./para_audiod > $@
+	help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
+
+man/man1/para_filter.1: para_filter
+	mkdir -p man/man1
+	help2man -h --detailed-help -N ./$< > $@
+
+man/man1/para_write.1: para_write
+	mkdir -p man/man1
+	help2man -h --detailed-help -N ./$< > $@
 
 man/man1/%.1: %
 	mkdir -p man/man1
@@ -161,15 +171,15 @@ ortp_recv.o: ortp_recv.c
 ortp_send.o: ortp_send.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
 
-oggdec.o: oggdec.c
+oggdec_filter.o: oggdec_filter.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 ogg_afh.o: ogg_afh.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 
-mp3dec.o: mp3dec.c
+mp3dec_filter.o: mp3dec_filter.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 
-aacdec.o: aacdec.c
+aacdec_filter.o: aacdec_filter.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
 aac_common.o: aac_common.c
@@ -202,8 +212,8 @@ para_audiod: @audiod_objs@
 para_audioc: @audioc_objs@
 	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
 
-para_fade: $(fade_objs)
-	$(CC) $(LDFLAGS) -o $@ $(fade_objs)
+para_fade: @fade_objs@
+	$(CC) $(LDFLAGS) -o $@ @fade_objs@
 
 para_server: @server_objs@
 	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
@@ -214,6 +224,9 @@ para_fsck: @fsck_objs@
 para_write: @write_objs@
 	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
 
+para_afh: @afh_objs@
+	$(CC) $(LDFLAGS) -o $@ @afh_objs@ @afh_ldflags@
+
 clean:
 	rm -f *.o $(BINARIES)
 	rm -rf man
@@ -237,7 +250,7 @@ install: all man
 
 @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add)
 	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
-	git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir $(tarball_pfx)
 	cp -r $(tarball_add) $(tarball_pfx)