X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=1ae7ce6acafb9bc6378db707f62f4040840ce7c3;hp=5203da87f1ae8a100b2b8671212eea896d438823;hb=190eec54bed8fe79e0ccd72614b253d591e76b4f;hpb=d5af72bb0148e2df6fac6aba10a64e48dab212fd

diff --git a/Makefile.in b/Makefile.in
index 5203da87..1ae7ce6a 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 := solar saturation
+codename := probabilistic parity
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -53,7 +53,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 +72,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 +113,7 @@ 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";; \
 	esac; \
 	if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
 	gengetopt $$O \
@@ -136,7 +134,7 @@ 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 echo "-i $$i"; done`"; \
 	help2man $$opts ./para_server > $@
 
 man/man1/para_audiod.1: para_audiod audiod_command_list.man
@@ -202,8 +200,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 +212,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