X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=19e229dda9b59d970e56b08237e765caac3044f3;hp=b02a5f44c20b34df0430bf02708754e45fdf065d;hb=14ca5388a4a1594e69069fb06d7e68efeb026c95;hpb=7fb39c9aeb527c03c1e3c33e158f727fb9380eaf

diff --git a/Makefile.real b/Makefile.real
index b02a5f44..19e229dd 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -11,8 +11,6 @@ uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
-m4_ggo_dir := m4/gengetopt
-test_dir := t
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
 else
@@ -26,6 +24,8 @@ cmdline_dir := $(build_dir)/cmdline
 m4depdir := $(build_dir)/m4deps
 help2man_dir := $(build_dir)/help2man
 hostbin_dir := $(build_dir)/host/bin
+m4_ggo_dir := m4/gengetopt
+test_dir := t
 
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
@@ -47,6 +47,39 @@ write_objs := $(addprefix $(object_dir)/, $(write_objs))
 afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
 play_objs := $(addprefix $(object_dir)/, $(play_objs))
 
+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 .gitignore)
+tarball := $(tarball_pfx).tar.bz2
+
+.PHONY: dep all clean clean2 distclean maintainer-clean install man tarball
+all: dep $(prefixed_executables) $(man_pages)
+dep: $(deps)
+man: $(man_pages)
+tarball: $(tarball)
+
+include $(m4_ggo_dir)/makefile
+include $(test_dir)/makefile.test
+ifeq ($(findstring clean, $(MAKECMDGOALS)),)
+-include $(deps)
+-include $(m4_deps)
+endif
+
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
+		$(help2man_dir) $(hostbin_dir):
+	$(Q) $(MKDIR_P) $@
+
+# When in doubt, use brute force (Ken Thompson)
+TOUPPER = \
+$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,\
+$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,\
+$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,\
+$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
+$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
+$(subst z,Z,$1))))))))))))))))))))))))))
+
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -77,18 +110,9 @@ CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += $(arch_cppflags)
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
-CPPFLAGS += $(osl_cppflags)
 
 LDFLAGS += $(clock_gettime_ldflags)
 
-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 := $(tarball_pfx).tar.bz2
-
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
 ifeq ("$(origin V)", "command line")
@@ -97,99 +121,112 @@ else
 	Q := @
 endif
 
-.PHONY: dep all clean distclean maintainer-clean install man tarball
-all: dep $(prefixed_executables) $(man_pages)
-dep: $(deps)
-man: $(man_pages)
-tarball: $(tarball)
-
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(hostbin_dir):
-	$(Q) $(MKDIR_P) $@
-
--include $(m4_ggo_dir)/makefile
-
-# When in doubt, use brute force (Ken Thompson)
-TOUPPER = \
-$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,\
-$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,\
-$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,\
-$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
-$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
-$(subst z,Z,$1))))))))))))))))))))))))))
-
 %_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 $<'
 	$(Q) $(HOSTCC) -o $@ $<
-error2.h: $(hostbin_dir)/error2
+error2.h: $(hostbin_dir)/error2 Makefile
 	@[ -z "$(Q)" ] || echo 'ER2 $<'
 	@echo "$(object_executable_matrix)" | $< > $@
 
 $(object_dir)/%.o: %.c | $(object_dir)
-$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags)
-$(object_dir)/gui%.o: CPPFLAGS += $(curses_cppflags)
-$(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags)
+$(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags)
+$(object_dir)/gui%.o $(dep_dir)/gui%.d: CPPFLAGS += $(curses_cppflags)
+$(object_dir)/spx%.o $(dep_dir)/spx%.d: CPPFLAGS += $(speex_cppflags)
 $(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)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
+$(object_dir)/mp3_afh.o $(dep_dir)/mp3_afh.d: CPPFLAGS += $(id3tag_cppflags)
+$(object_dir)/crypt.o $(dep_dir)/crypt.d: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/gcrypt.o $(dep_dir)/gcrypt.d: CPPFLAGS += $(gcrypt_cppflags)
+
+$(object_dir)/mp3dec_filter.o $(dep_dir)/mp3dec_filter.d \
+: CPPFLAGS += $(mad_cppflags)
+
 $(object_dir)/compress_filter.o: CPPFLAGS += -O3
-$(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
+$(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags)
 
-$(object_dir)/aacdec_filter.o \
-$(object_dir)/aac_common.o \
-$(object_dir)/aac_afh.o \
+$(object_dir)/aacdec_filter.o $(dep_dir)/aacdec_filter.d \
+$(object_dir)/aac_common.o $(dep_dir)/aac_common.d \
+$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d \
 : CPPFLAGS += $(faad_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)/ogg_afh.o $(dep_dir)/ogg_afh.d \
+$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \
+: CPPFLAGS += $(vorbis_cppflags)
+
+$(object_dir)/spx_common.o $(dep_dir)/spx_common.d \
+$(object_dir)/spxdec_filter.o $(dep_dir)/spxdec_filter.d \
+$(object_dir)/spx_afh.o $(dep_dir)/spx_afh.d \
+$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \
+$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \
+$(object_dir)/ogg_afh_common.o $(dep_dir)/ogg_afh_common.d \
+$(object_dir)/opus%.o $(dep_dir)/opus%.d \
 : CPPFLAGS += $(ogg_cppflags)
 
+$(object_dir)/afs.o $(dep_dir)/afs.d \
+$(object_dir)/aft.o $(dep_dir)/aft.d \
+$(object_dir)/attribute.o $(dep_dir)/attribute.d \
+$(object_dir)/blob.o $(dep_dir)/blob.d  \
+$(object_dir)/mood.o $(dep_dir)/mood.d \
+$(object_dir)/playlist.o $(dep_dir)/playlist.d \
+$(object_dir)/score.o $(dep_dir)/score.d \
+$(object_dir)/server.o $(dep_dir)/server.d \
+$(object_dir)/vss.o $(dep_dir)/vss.d \
+$(object_dir)/command.o $(dep_dir)/command.d \
+$(object_dir)/http_send.o $(dep_dir)/http_send.d \
+$(object_dir)/dccp_send.o $(dep_dir)/dccp_send.d \
+$(object_dir)/udp_send.o $(dep_dir)/udp_send.d \
+$(object_dir)/send_common.o $(dep_dir)/send_common.d \
+$(object_dir)/mm.o $(dep_dir)/mm.d \
+: CPPFLAGS += $(osl_cppflags)
+
 $(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $<
 
 $(dep_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c error2.h | $(dep_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
@@ -201,11 +238,6 @@ $(dep_dir)/%.d: %.c error2.h | $(dep_dir)
 	$(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
 		$(CPPFLAGS) $< > $@
 
-ifeq ($(findstring clean, $(MAKECMDGOALS)),)
--include $(deps)
--include $(m4_deps)
-endif
-
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
@@ -288,14 +320,13 @@ install: all man
 	$(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
 $(tarball):
-	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
-	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+	$(Q) rm -rf $(tarball) $(tarball_pfx)
+	$(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
-	$(MKDIR_P) $(tarball_pfx)
-	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
-	cp -r $(autocrap) $(tarball_pfx)
-	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
-	bzip2 -9 $(tarball_pfx).tar
-	ls -l $(tarball_pfx).tar.bz2
-	rm -rf $(tarball_pfx)
-include $(test_dir)/makefile.test
+	$(Q) $(MKDIR_P) $(tarball_pfx)
+	$(Q) ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
+	$(Q) cp $(autocrap) $(tarball_pfx)
+	$(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/*
+	$(Q) bzip2 -9 $(tarball_pfx).tar
+	$(Q) ls -l $(tarball)
+	$(Q) rm -rf $(tarball_pfx)