X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=7ccd970d7232bca1d4828057cc3dbb367ec8b7f8;hp=3fbbce21ab5f3fe91d674750a4d3f7804c346188;hb=24758c5f;hpb=b62e2796b85c7d7f3138fe729f4637853e0fafe0 diff --git a/Makefile.in b/Makefile.in index 3fbbce21..7ccd970d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,16 +8,38 @@ MANDIR := @datarootdir@/man/man1 PACKAGE_VERSION := @PACKAGE_VERSION@ PACKAGE_STRING := @PACKAGE_STRING@ install_sh := @install_sh@ -cmdline_dir := @cmdline_dir@ +executables := @executables@ + +GENGETOPT := @gengetopt@ +HELP2MAN := @help2man@ +MKDIR_P := mkdir -p 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 := deterministic entropy +codename := spectral gravity + +GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) -DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W +m4_ggo_dir := m4/gengetopt +test_dir := t +ifeq ("$(origin O)", "command line") + build_dir := $(O) +else + build_dir := build +endif +ggo_dir := $(build_dir)/ggo +object_dir := $(build_dir)/objects +dep_dir := $(build_dir)/deps +man_dir := $(build_dir)/man/man1 +cmdline_dir := $(build_dir)/cmdline + +DEBUG_CPPFLAGS += -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls +DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas +DEBUG_CPPFLAGS += -Wformat-security +DEBUG_CPPFLAGS += -Wmissing-format-attribute # produces false positives # DEBUG_CPPFLAGS += -Wunreachable-code # DEBUG_CPPFLAGS += -Wwrite-strings @@ -26,6 +48,7 @@ DEBUG_CPPFLAGS += -Wredundant-decls # DEBUG_CPPFLAGS += -Wextra # DEBUG_CPPFLAGS += -Wold-style-definition # DEBUG_CPPFLAGS += -Wdeclaration-after-statement +# DEBUG_CPPFLAGS += -Wsuggest-attribute=const # many warnings about trivial stuff # CPPFLAGS += -Wconversion @@ -35,124 +58,102 @@ ifeq ($(uname_s),Linux) LDFLAGS += -Wl,--gc-sections CPPFLAGS += -Wstrict-prototypes CPPFLAGS += -Wshadow + # causes warnings on *BSD for the feature test macros + CPPFLAGS += -Wunused-macros endif CPPFLAGS += -Os -CPPFLAGS += -Wall CPPFLAGS += -Wuninitialized CPPFLAGS += -Wchar-subscripts -CPPFLAGS += -Wformat-security CPPFLAGS += -DBINDIR='"$(BINDIR)"' CPPFLAGS += -DBUILD_DATE='"$(build_date)"' CPPFLAGS += -DUNAME_RS='"$(uname_rs)"' 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)"' - -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 +LDFLAGS += @clock_gettime_ldflags@ -m4_ggos := afh audioc audiod client filter gui recv server write -all_ggos := $(m4_ggos) dccp_recv 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))) +man_pages := $(patsubst %, $(man_dir)/%.1, @executables@) autocrap := config.h.in configure tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION) tarball_delete := $(addprefix $(tarball_pfx)/,\ - web versions .changelog_before_cvs .changelog_cvs .gitignore\ - $(ggo_dir) skencil) + web .changelog_before_cvs .changelog_cvs .gitignore\ + 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 = +ifeq ("$(origin V)", "command line") + Q := else - Q = @ + Q := @ endif -.PHONY: all clean distclean maintainer-clean install man tarball\ - .FORCE-GIT-VERSION-FILE -all: @executables@ $(man_pages) +.PHONY: dep all clean distclean maintainer-clean install man tarball +all: dep @executables@ $(man_pages) +dep: $(deps) man: $(man_pages) tarball: $(tarball) -GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE - @./GIT-VERSION-GEN GIT-VERSION-FILE --include GIT-VERSION-FILE -@executables@: GIT-VERSION-FILE +$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir): + $(Q) $(MKDIR_P) $@ --include $(ggo_dir)/makefile +-include $(m4_ggo_dir)/makefile -%_command_list.c: %.cmd - @[ -z "$(Q)" ] || echo 'GEN $@' - $(Q) ./command_util.sh c < $< >$@ -%_command_list.h: %.cmd +# 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 < $< >$@ -%_command_list.man: %.cmd +%_command_list.man: %.cmd %.c @[ -z "$(Q)" ] || echo 'GEN $@' $(Q) ./command_util.sh man < $< > $@ +%_completion.h: %.cmd %.c + @[ -z "$(Q)" ] || echo 'GEN $@' + $(Q) ./command_util.sh 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_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 $<' +$(man_dir)/para_server.1: para_server $(server_command_lists_man) | $(man_dir) + @[ -z "$(Q)" ] || echo 'MAN $<' $(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 | $(man_dir) - @[ -z "$(Q)" ] || echo 'HELP2MAN $<' - $(Q) help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@ - -man/man1/%.1: % | $(man_dir) - @[ -z "$(Q)" ] || echo 'HELP2MAN $<' - $(Q) help2man -h --detailed-help -N ./$< > $@ + $(HELP2MAN) $$opts ./para_server > $@ -man/html/%.html: man/man1/%.1 - @[ -z "$(Q)" ] || echo 'MAN2HTML $<' - $(Q) mkdir -p man/html - $(Q) man2html $< > $@ +$(man_dir)/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir) + @[ -z "$(Q)" ] || echo 'MAN $<' + $(Q) $(HELP2MAN) -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@ -web/%.man.in.html: man/man1/%.1 - @[ -z "$(Q)" ] || echo 'MAN2HTML $<' - $(Q) mkdir -p man/html - $(Q) man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD>/d' > $@ +$(man_dir)/para_play.1: para_play play_command_list.man | $(man_dir) + @[ -z "$(Q)" ] || echo 'MAN $<' + $(Q) $(HELP2MAN) -h --detailed-help -N -i play_command_list.man ./para_play > $@ -$(object_dir): - mkdir -p $@ -$(man_dir): - mkdir -p $@ +$(man_dir)/%.1: % | $(man_dir) + @[ -z "$(Q)" ] || echo 'MAN $<' + $(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@ +$(object_dir)/crypt.o: crypt.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @openssl_cppflags@ $< $(object_dir)/spx_common.o: spx_common.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< @@ -193,6 +194,17 @@ $(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)/mp3_afh.o: mp3_afh.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @id3tag_cppflags@ $< + +$(object_dir)/gui%.o: gui%.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $< +$(object_dir)/ao_write.o: ao_write.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ao_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 $@ $< @@ -201,13 +213,20 @@ $(object_dir)/%.o: %.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $< -$(object_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(object_dir) +$(dep_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(dep_dir) @[ -z "$(Q)" ] || echo 'DEP $<' - $(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@ + $(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \ + $(CPPFLAGS) $< > $@ -$(object_dir)/%.d: %.c | $(object_dir) +$(dep_dir)/%.d: %.c | $(dep_dir) @[ -z "$(Q)" ] || echo 'DEP $<' - $(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@ + $(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \ + $(CPPFLAGS) $< > $@ + +all_objs := @recv_objs@ @filter_objs@ @client_objs@ @gui_objs@ \ + @audiod_objs@ @audioc_objs@ @fade_objs@ @server_objs@ \ + @write_objs@ @afh_objs@ @play_objs@ +deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d)) recv_objs := $(addprefix $(object_dir)/, @recv_objs@) filter_objs := $(addprefix $(object_dir)/, @filter_objs@) @@ -219,13 +238,10 @@ 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) +play_objs := $(addprefix $(object_dir)/, @play_objs@) ifeq ($(findstring clean, $(MAKECMDGOALS)),) --include $(all_objs:.o=.d) +-include $(deps) endif para_recv: $(recv_objs) @@ -242,9 +258,9 @@ para_client: $(client_objs) para_gui: $(gui_objs) @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses + $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses -para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs) +para_audiod: $(audiod_objs) @[ -z "$(Q)" ] || echo 'LD $@' $(Q) $(CC) $(LDFLAGS) -o $@ $(audiod_objs) @audiod_ldflags@ @@ -256,7 +272,7 @@ para_fade: $(fade_objs) @[ -z "$(Q)" ] || echo 'LD $@' $(Q) $(CC) $(LDFLAGS) -o $@ $(fade_objs) @fade_ldflags@ -para_server: $(server_command_lists_ch) $(server_objs) +para_server: $(server_objs) @[ -z "$(Q)" ] || echo 'LD $@' $(Q) $(CC) $(LDFLAGS) -o $@ $(server_objs) @server_ldflags@ @@ -268,48 +284,51 @@ para_afh: $(afh_objs) @[ -z "$(Q)" ] || echo 'LD $@' $(Q) $(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@ +para_play: $(play_objs) + @[ -z "$(Q)" ] || echo 'LD $@' + $(Q) $(CC) $(LDFLAGS) -o $@ $(play_objs) @play_ldflags@ + clean: @[ -z "$(Q)" ] || echo 'CLEAN' - $(Q) rm -f @executables@ $(object_dir)/*.o + $(Q) rm -f @executables@ + $(Q) rm -rf $(object_dir) clean2: clean @[ -z "$(Q)" ] || echo 'CLEAN2' - $(Q) rm -rf man $(object_dir) - $(Q) rm -f *_command_list.* - -distclean: clean2 + $(Q) rm -f *_command_list.* *_completion.h + $(Q) rm -rf $(build_dir) +distclean: clean2 test-clean @[ -z "$(Q)" ] || echo 'DISTCLEAN' $(Q) rm -f Makefile autoscan.log config.status config.log - $(Q) rm -rf autom4te.cache aclocal.m4 + $(Q) rm -rf autom4te.cache $(Q) rm -f GPATH GRTAGS GSYMS GTAGS maintainer-clean: distclean - rm -f $(ggo_generated) *.tar.bz2 \ + rm -f *.tar.bz2 \ config.h configure \ config.h.in skencil/*.pdf skencil/*.ps - rm -rf web_sync $(cmdline_dir) + rm -rf web_sync install: all man - mkdir -p $(BINDIR) $(MANDIR) + $(MKDIR_P) $(BINDIR) $(MANDIR) $(install_sh) -s -m 755 @executables@ $(BINDIR) $(install_sh) -m 644 $(man_pages) $(MANDIR) - mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain + $(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain -$(tarball): $(cmdline_generated) +$(tarball): rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \ | tar --delete $(tarball_delete) > $(tarball_pfx).tar - mkdir -p $(tarball_pfx)/$(cmdline_dir) - echo $(GIT_VERSION) > $(tarball_pfx)/VERSION + $(MKDIR_P) $(tarball_pfx) + ./GIT-VERSION-GEN > $(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 - rm -f $(tarball_pfx).tar ls -l $(tarball_pfx).tar.bz2 + rm -rf $(tarball_pfx) %.ps: %.sk sk2ps $< > $@ %.pdf: %.ps ps2pdf - - < $< > $@ +include $(test_dir)/makefile.test