X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=ab2389536fd29a9b1cb6196c068a33b122600fd8;hp=d80203765c521d68a3f2f634536cf46283142545;hb=ece0cc264ef6551c2064489757c0efbe6d60aa97;hpb=b5c6af5c26bbb2b3d0e6928892bd5d915e329136

diff --git a/Makefile.real b/Makefile.real
index d8020376..ab238953 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -51,11 +51,10 @@ man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
 tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-tarball_delete := $(addprefix $(tarball_pfx)/,\
-	web .changelog_before_cvs .changelog_cvs .gitignore)
+tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-.PHONY: dep all clean distclean maintainer-clean install man tarball
+.PHONY: dep all clean clean2 distclean maintainer-clean install man tarball
 all: dep $(prefixed_executables) $(man_pages)
 dep: $(deps)
 man: $(man_pages)
@@ -125,36 +124,44 @@ endif
 
 %_command_list.h: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh h < $< >$@
+	$(Q) ./command_util.bash h < $< >$@
 %_command_list.man: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh man < $< > $@
+	$(Q) ./command_util.bash man < $< > $@
 %_completion.h: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
+	$(Q) ./command_util.bash compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
 		$(strip $(call TOUPPER,$(*F)))_COMMANDS	< $< > $@
 
 server_command_list.h server_command_list.man server_completion.h: command.c
 afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute.c
 audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c
 
-server_command_lists_man = server_command_list.man afs_command_list.man
-$(man_dir)/para_server.1: $(help2man_dir)/para_server $(server_command_lists_man) | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) opts="`for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
-	$(HELP2MAN) $$opts ./$< > $@
+server_command_lists := server_command_list.man afs_command_list.man
+audiod_command_lists := audiod_command_list.man
+play_command_lists := play_command_list.man
 
-$(man_dir)/para_audiod.1: $(help2man_dir)/para_audiod audiod_command_list.man | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -N -i audiod_command_list.man ./$< > $@
+$(man_dir)/para_server.1: $(server_command_lists)
+$(man_dir)/para_audiod.1: $(audiod_command_lists)
+$(man_dir)/para_play.1: $(play_command_lists)
 
-$(man_dir)/para_play.1: $(help2man_dir)/para_play play_command_list.man | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -N -i play_command_list.man ./$< > $@
+$(man_dir)/para_server.1: man_util_command_lists := $(server_command_lists)
+$(man_dir)/para_audiod.1: man_util_command_lists := $(audiod_command_lists)
+$(man_dir)/para_play.1: man_util_command_lists := $(play_command_lists)
 
-$(man_dir)/%.1: $(help2man_dir)/% | $(man_dir)
+$(man_dir)/para_%.1: $(ggo_dir)/%.ggo man_util.bash | $(man_dir) $(help2man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -N ./$< > $@
+	$(Q) \
+		COMMAND_LISTS="$(man_util_command_lists)" \
+		FILTERS="$(filters)" \
+		GENGETOPT=$(GENGETOPT) \
+		GGO_DIR=$(ggo_dir) \
+		HELP2MAN=$(HELP2MAN) \
+		HELP2MAN_DIR=$(help2man_dir) \
+		RECEIVERS="$(receivers)" \
+		VERSION="$(GIT_VERSION)" \
+		WRITERS="$(writers)" \
+		./man_util.bash $@
 
 $(hostbin_dir)/error2: error2.c | $(hostbin_dir)
 	@[ -z "$(Q)" ] || echo 'HCC $<'
@@ -171,6 +178,7 @@ $(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
 
 $(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
 $(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags)
 $(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
 $(object_dir)/compress_filter.o: CPPFLAGS += -O3
 $(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
@@ -180,12 +188,17 @@ $(object_dir)/aac_common.o \
 $(object_dir)/aac_afh.o \
 : CPPFLAGS += $(faad_cppflags)
 
+$(object_dir)/ogg_afh.o \
+$(object_dir)/oggdec_filter.o \
+: CPPFLAGS += $(vorbis_cppflags)
+
 $(object_dir)/spx_common.o \
 $(object_dir)/spxdec_filter.o \
 $(object_dir)/spx_afh.o \
 $(object_dir)/oggdec_filter.o \
 $(object_dir)/ogg_afh.o \
 $(object_dir)/ogg_afh_common.o \
+$(object_dir)/opus%.o \
 : CPPFLAGS += $(ogg_cppflags)
 
 $(object_dir)/%.o: %.c | $(object_dir)