X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=426072c8431ee4466dbfd60ce97012a11da2eb78;hp=f184546b8ea22776a91f502a1c49f321b1fecbf7;hb=f4cc69fd2fad1e51f47be16f552e7a114f43eade;hpb=4108592dd3ac3a4cbee530b64c6f9c8b6a60be99

diff --git a/Makefile.in b/Makefile.in
index f184546b..426072c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,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 := simultaneous independence
+codename := associative expansion
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -61,14 +61,12 @@ CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
 CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
-BINARIES = para_server para_client para_audioc para_recv \
-	para_filter para_write 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))
+man_pages := $(patsubst %, man/man1/%.1, @executables@)
+man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
 
 ggo_dir := ggo
 object_dir := objects
+man_dir := man/man1
 
 m4_ggos := afh audioc audiod client filter gui recv server write
 all_ggos := $(m4_ggos) dccp_recv oggdec_filter alsa_write oss_write fade http_recv \
@@ -85,82 +83,115 @@ tarball_delete := $(addprefix $(tarball_pfx)/,\
 	$(ggo_dir) skencil)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
+# To put more focus on warnings, be less verbose as default
+# Use 'make V=1' to see the full commands
+ifdef V
+	ifeq ("$(origin V)", "command line")
+		BUILD_VERBOSE = $(V)
+	endif
+endif
+ifndef BUILD_VERBOSE
+	BUILD_VERBOSE = 0
+endif
+ifeq ($(BUILD_VERBOSE),1)
+	Q =
+else
+	Q = @
+endif
+
 .PHONY: all clean distclean maintainer-clean install man tarball\
 	.FORCE-GIT-VERSION-FILE
-all: $(BINARIES) $(man_pages)
+all: @executables@ $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN GIT-VERSION-FILE
 -include GIT-VERSION-FILE
-$(BINARIES): GIT-VERSION-FILE
+@executables@: GIT-VERSION-FILE
 
 -include $(ggo_dir)/makefile
 
 %_command_list.c: %.cmd
-	./command_util.sh c < $< >$@
+	@[ -z "$(Q)" ] || echo 'GEN $@'
+	$(Q) ./command_util.sh c < $< >$@
 %_command_list.h: %.cmd
-	./command_util.sh h < $< >$@
+	@[ -z "$(Q)" ] || echo 'GEN $@'
+	$(Q) ./command_util.sh h < $< >$@
 %_command_list.man: %.cmd
-	./command_util.sh man < $< > $@
+	@[ -z "$(Q)" ] || echo 'GEN $@'
+	$(Q) ./command_util.sh man < $< > $@
 
 server_command_lists_ch = server_command_list.c afs_command_list.c \
 	server_command_list.h afs_command_list.h
 server_command_lists_man = server_command_list.man afs_command_list.man
-man/man1/para_server.1: para_server $(server_command_lists_man)
-	mkdir -p man/man1
-	opts="-h --detailed-help -N `for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
+man/man1/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
+	@[ -z "$(Q)" ] || echo 'HELP2MAN $<'
+	$(Q) opts="-h --detailed-help -N `for i in $(server_command_lists_man); 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 -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
+man/man1/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir)
+	@[ -z "$(Q)" ] || echo 'HELP2MAN $<'
+	$(Q) help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
 
-man/man1/%.1: %
-	mkdir -p man/man1
-	help2man -h --detailed-help -N ./$< > $@
+man/man1/%.1: % | $(man_dir)
+	@[ -z "$(Q)" ] || echo 'HELP2MAN $<'
+	$(Q) help2man -h --detailed-help -N ./$< > $@
 
 man/html/%.html: man/man1/%.1
-	mkdir -p man/html
-	man2html $< > $@
+	@[ -z "$(Q)" ] || echo 'MAN2HTML $<'
+	$(Q) mkdir -p man/html
+	$(Q) man2html $< > $@
 
 web/%.man.in.html: man/man1/%.1
-	man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/d' > $@
+	@[ -z "$(Q)" ] || echo 'MAN2HTML $<'
+	$(Q) mkdir -p man/html
+	$(Q) man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/d' > $@
 
 $(object_dir):
 	mkdir -p $@
+$(man_dir):
+	mkdir -p $@
 
 $(object_dir)/oggdec_filter.o: oggdec_filter.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 
 $(object_dir)/ogg_afh.o: ogg_afh.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 
 $(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
 
 $(object_dir)/aacdec_filter.o: aacdec_filter.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
 $(object_dir)/aac_common.o: aac_common.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
 $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
-	$(CC) -c $(CPPFLAGS) -o $@ $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c $(CPPFLAGS) -o $@ $<
 
 $(object_dir)/%.o: %.c | $(object_dir)
-	$(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+
+$(object_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'DEP $<'
+	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
-# We depend on the *.cmdline.[ch] files as these must be present for depend.sh
-# to work. The first dependency is explititly given as it is used by $<.
-$(object_dir)/%.cmdline.d: %.cmdline.c $(cmdline_generated) | $(object_dir)
-	./depend.sh $(object_dir) $(CPPFLAGS) $< > $@
-$(object_dir)/%.d: %.c $(cmdline_generated) | $(object_dir)
-	./depend.sh  $(object_dir) $(CPPFLAGS) $< > $@
+$(object_dir)/%.d: %.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'DEP $<'
+	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
@@ -174,51 +205,67 @@ write_objs := $(addprefix $(object_dir)/, @write_objs@)
 afh_objs := $(addprefix $(object_dir)/, @afh_objs@)
 
 all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
-	$(audiod_objs ) $(audioc_objs) $(fade_objs) $(server_objs) \
+	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
 	$(write_objs) $(afh_objs)
+
+ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(all_objs:.o=.d)
+endif
 
 para_recv: $(recv_objs)
-	$(CC) $(LDFLAGS) $(recv_objs) -o $@ @recv_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) $(recv_objs) -o $@ @recv_ldflags@
 
 para_filter: $(filter_objs)
-	$(CC) $(LDFLAGS) $(filter_objs) -o $@ @filter_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) $(filter_objs) -o $@ @filter_ldflags@
 
 para_client: $(client_objs)
-	$(CC) $(LDFLAGS) -o $@ $(client_objs) @client_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(client_objs) @client_ldflags@
 
 para_gui: $(gui_objs)
-	$(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses
 
 para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs)
-	$(CC) $(LDFLAGS) -o $@ $(audiod_objs) @audiod_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(audiod_objs) @audiod_ldflags@
 
 para_audioc: $(audioc_objs)
-	$(CC) $(LDFLAGS) -o $@ $(audioc_objs) @audioc_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(audioc_objs) @audioc_ldflags@
 
 para_fade: $(fade_objs)
-	$(CC) $(LDFLAGS) -o $@ $(fade_objs) @fade_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(fade_objs) @fade_ldflags@
 
 para_server: $(server_command_lists_ch) $(server_objs)
-	$(CC) $(LDFLAGS) -o $@ $(server_objs)  @server_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(server_objs)  @server_ldflags@
 
 para_write: $(write_objs)
-	$(CC) $(LDFLAGS) -o $@ $(write_objs) @write_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(write_objs) @write_ldflags@
 
 para_afh: $(afh_objs)
-	$(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@
 
 clean:
-	rm -f $(BINARIES) $(object_dir)/*.o
+	@[ -z "$(Q)" ] || echo 'CLEAN'
+	$(Q) rm -f $(BINARIES) $(object_dir)/*.o
 
 clean2: clean
-	rm -rf man $(object_dir)
-	rm -f *_command_list.*
+	@[ -z "$(Q)" ] || echo 'CLEAN2'
+	$(Q) rm -rf man $(object_dir)
+	$(Q) rm -f *_command_list.*
 
 distclean: clean2
-	rm -f Makefile autoscan.log config.status config.log && \
-	rm -rf autom4te.cache aclocal.m4
-	rm -f GPATH GRTAGS GSYMS GTAGS
+	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
+	$(Q) rm -f Makefile autoscan.log config.status config.log
+	$(Q) rm -rf autom4te.cache aclocal.m4
+	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
 	rm -f $(ggo_generated) *.tar.bz2 \