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

diff --git a/Makefile.in b/Makefile.in
index 5203da87..a24ba6ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,14 +5,16 @@ BINDIR := @bindir@
 VARDIR := /var/paraslash
 PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
 MANDIR := @datarootdir@/man/man1
-
+PACKAGE_VERSION := @PACKAGE_VERSION@
+PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
+cmdline_dir := @cmdline_dir@
 
 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 := concurrent eternalty
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -23,6 +25,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,189 +48,233 @@ 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 += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += @SSL_CPPFLAGS@
 CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
+CPPFLAGS += -I/usr/local/include
+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_fsck @extra_binaries@
+	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))
-gengetopts := $(wildcard *.ggo)
-gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
-gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
+
+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 \
+	osx_write udp_recv amp_filter compress_filter file_write \
+	mp3dec_filter prebuffer_filter
+ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
+cmdline_generated := $(addprefix $(cmdline_dir)/,$(addsuffix .cmdline.c, $(all_ggos)) \
+	$(addsuffix .cmdline.h, $(all_ggos)))
+
 autocrap := config.h.in configure
-tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
-tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
-tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
-tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
-tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2
+tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
+tarball_delete := $(addprefix $(tarball_pfx)/,\
+	web versions .changelog_before_cvs .changelog_cvs .gitignore\
+	$(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: clean distclean maintainer-clean install man tarball
+.PHONY: all clean distclean maintainer-clean install man tarball\
+	.FORCE-GIT-VERSION-FILE
 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
-
-module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
-
-grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
-	gengetopt $(module_ggo_opts) \
-		-S \
-		--set-package=grab \
-		--no-handle-help \
-		--no-handle-error \
-		--no-handle-version \
-		--arg-struct-name=grab_client_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
-
-%_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
-	gengetopt $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$<) \
-		--arg-struct-name=$(subst .ggo,,$<)_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
-
-%_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
-	gengetopt $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$<) \
-		--arg-struct-name=$(subst .ggo,,$<)_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
-%_write.cmdline.h %_write.cmdline.c: %_write.ggo
-	gengetopt -S $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$<) \
-		--arg-struct-name=$(subst .ggo,,$<)_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst _write.ggo,,$<)_cmdline_parser < $<
-
-%.cmdline.h %.cmdline.c: %.ggo
-	case $< in client.ggo) O="--unamed-opts=command";; \
-		audioc.ggo) O="--unamed-opts=command";; \
-		fsck.ggo) O="--unamed-opts=table";; \
-	esac; \
-	if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
-	gengetopt $$O \
-		--no-handle-version \
-		--file-name=$(*F).cmdline \
-		--func-name $(*F)_cmdline_parser \
-		--arg-struct-name=$(*F)_args_info \
-		--set-package="para_$(subst .cmdline,,$(*F))" \
-		--set-version="@PACKAGE_VERSION@"  < $<
-
-%_command_list.c %_command_list.h: %.cmd
-	./command_util.sh c < $< >$@
-	./command_util.sh h < $< >$(@:%.c=%.h)
+GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+	@./GIT-VERSION-GEN GIT-VERSION-FILE
+-include GIT-VERSION-FILE
+$(BINARIES): GIT-VERSION-FILE
 
-%_command_list.man: %.cmd
-	./command_util.sh man < $< > $@
+-include $(ggo_dir)/makefile
 
-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`"; \
+%_command_list.c: %.cmd
+	@[ -z "$(Q)" ] || echo 'GEN $@'
+	$(Q) ./command_util.sh c < $< >$@
+%_command_list.h: %.cmd
+	@[ -z "$(Q)" ] || echo 'GEN $@'
+	$(Q) ./command_util.sh h < $< >$@
+%_command_list.man: %.cmd
+	@[ -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) | $(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 -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 -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' > $@
-
-
-ortp_recv.o: ortp_recv.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
-
-ortp_send.o: ortp_send.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
-
-oggdec.o: oggdec.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
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
-
-aacdec.o: aacdec.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
-
-aac_common.o: aac_common.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
-
-aac_afh.o: aac_afh.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
-
-%.cmdline.o: %.cmdline.c
-	$(CC) -c $(CPPFLAGS) $<
-
-%.o: %.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
-
-para_recv: @recv_objs@
-	$(CC) $(LDFLAGS) @recv_objs@ -o $@ @recv_ldflags@
-
-para_filter: @filter_objs@
-	$(CC) $(LDFLAGS) @filter_objs@ -o $@ @filter_ldflags@
-
-para_client: @client_objs@
-	$(CC) $(LDFLAGS) -o $@ @client_objs@ @client_ldflags@
-
-para_gui: @gui_objs@
-	$(CC) $(LDFLAGS) -o $@ @gui_objs@ -lncurses
-
-para_audiod: @audiod_objs@
-	$(CC) $(LDFLAGS) -o $@ @audiod_objs@ @audiod_ldflags@
-
-para_audioc: @audioc_objs@
-	$(CC) $(LDFLAGS) -o $@ @audioc_objs@ @audioc_ldflags@
+	@[ -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)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+
+$(object_dir)/ogg_afh.o: ogg_afh.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
+
+$(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $<
+
+$(object_dir)/aacdec_filter.o: aacdec_filter.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+
+$(object_dir)/aac_common.o: aac_common.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+
+$(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
+	@[ -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)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c $(CPPFLAGS) -o $@ $<
+
+$(object_dir)/%.o: %.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_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)
+	@[ -z "$(Q)" ] || echo 'DEP $<'
+	$(Q) ./depend.sh $(object_dir) $(CPPFLAGS) $< > $@
+
+$(object_dir)/%.d: %.c $(cmdline_generated) | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'DEP $<'
+	$(Q) ./depend.sh  $(object_dir) $(CPPFLAGS) $< > $@
+
+recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
+filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
+client_objs := $(addprefix $(object_dir)/, @client_objs@)
+gui_objs := $(addprefix $(object_dir)/, @gui_objs@)
+audiod_objs := $(addprefix $(object_dir)/, @audiod_objs@)
+audioc_objs := $(addprefix $(object_dir)/, @audioc_objs@)
+fade_objs := $(addprefix $(object_dir)/, @fade_objs@)
+server_objs := $(addprefix $(object_dir)/, @server_objs@)
+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) \
+	$(write_objs) $(afh_objs)
+-include $(all_objs:.o=.d)
+
+para_recv: $(recv_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) $(recv_objs) -o $@ @recv_ldflags@
+
+para_filter: $(filter_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) $(filter_objs) -o $@ @filter_ldflags@
+
+para_client: $(client_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(client_objs) @client_ldflags@
+
+para_gui: $(gui_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses
+
+para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(audiod_objs) @audiod_ldflags@
+
+para_audioc: $(audioc_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(audioc_objs) @audioc_ldflags@
 
 para_fade: $(fade_objs)
-	$(CC) $(LDFLAGS) -o $@ $(fade_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(fade_objs) @fade_ldflags@
 
-para_server: @server_objs@
-	$(CC) $(LDFLAGS) -o $@ @server_objs@  @server_ldflags@
+para_server: $(server_command_lists_ch) $(server_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(server_objs)  @server_ldflags@
 
-para_fsck: @fsck_objs@
-	$(CC) $(LDFLAGS) -o $@ @fsck_objs@ @fsck_ldflags@
+para_write: $(write_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(write_objs) @write_ldflags@
 
-para_write: @write_objs@
-	$(CC) $(LDFLAGS) -o $@ @write_objs@ @write_ldflags@
+para_afh: $(afh_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@
 
 clean:
-	rm -f *.o $(BINARIES)
-	rm -rf man
-distclean: clean
-	rm -f Makefile autoscan.log config.status config.log && \
-	rm -rf web/sync/* autom4te.cache aclocal.m4
-	rm -f GPATH GRTAGS GSYMS GTAGS
+	@[ -z "$(Q)" ] || echo 'CLEAN'
+	$(Q) rm -f $(BINARIES) $(object_dir)/*.o
+
+clean2: clean
+	@[ -z "$(Q)" ] || echo 'CLEAN2'
+	$(Q) rm -rf man $(object_dir)
+	$(Q) rm -f *_command_list.*
+
+distclean: clean2
+	@[ -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 $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
+	rm -f $(ggo_generated) *.tar.bz2 \
 		config.h configure \
 		config.h.in skencil/*.pdf skencil/*.ps
-	rm -f *_command_list.* *.man man/man1/*
-	rm -rf web_sync
+	rm -rf web_sync $(cmdline_dir)
 
 install: all man
 	mkdir -p $(BINDIR) $(MANDIR)
@@ -235,12 +282,14 @@ install: all man
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add)
+$(tarball): $(cmdline_generated)
 	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)
+	mkdir -p $(tarball_pfx)/$(cmdline_dir)
+	echo $(GIT_VERSION) > $(tarball_pfx)/VERSION
+	cp -r $(autocrap) $(tarball_pfx)
+	cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
 	rm -rf $(tarball_pfx)
 	bzip2 -9 $(tarball_pfx).tar