X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=68aa6bc9eaef45d9c1bf27e654c047af5798cf23;hp=3fbbce21ab5f3fe91d674750a4d3f7804c346188;hb=a7a72ca4acf7f44abca866d410e2bc80590e7fab;hpb=fd00054b1c8f06dd80b4d26762141902449c5fc7 diff --git a/Makefile.in b/Makefile.in index 3fbbce21..68aa6bc9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,15 +9,24 @@ PACKAGE_VERSION := @PACKAGE_VERSION@ PACKAGE_STRING := @PACKAGE_STRING@ install_sh := @install_sh@ cmdline_dir := @cmdline_dir@ +executables := @executables@ + +GENGETOPT := @gengetopt@ +HELP2MAN := @help2man@ 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 := hybrid causality + +GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) -DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W +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 +35,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 @@ -37,29 +47,23 @@ ifeq ($(uname_s),Linux) CPPFLAGS += -Wshadow 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@) @@ -67,20 +71,19 @@ man_pages_in := $(patsubst %, web/%.man.in.html, @executables@) ggo_dir := ggo object_dir := objects man_dir := man/man1 +test_dir := t -m4_ggos := afh audioc audiod client filter gui recv server write +m4_ggos := afh audioc audiod client filter gui recv server write ao_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))) 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) + skencil) tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2 # To put more focus on warnings, be less verbose as default @@ -93,23 +96,18 @@ endif ifndef BUILD_VERBOSE BUILD_VERBOSE = 0 endif -ifeq ($(BUILD_VERBOSE),1) - Q = -else +ifeq ($(BUILD_VERBOSE),0) Q = @ +else + 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 - -include $(ggo_dir)/makefile %_command_list.c: %.cmd @@ -126,17 +124,17 @@ 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 $<' + @[ -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 > $@ + $(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 > $@ + @[ -z "$(Q)" ] || echo 'MAN $<' + $(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 ./$< > $@ + @[ -z "$(Q)" ] || echo 'MAN $<' + $(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@ man/html/%.html: man/man1/%.1 @[ -z "$(Q)" ] || echo 'MAN2HTML $<' @@ -153,6 +151,9 @@ $(object_dir): $(man_dir): mkdir -p $@ +$(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,13 @@ $(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)/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 $@ $< @@ -209,6 +217,7 @@ $(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@) client_objs := $(addprefix $(object_dir)/, @client_objs@) @@ -224,8 +233,10 @@ all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \ $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \ $(write_objs) $(afh_objs) +deps := $(all_objs:.o=.d) + ifeq ($(findstring clean, $(MAKECMDGOALS)),) --include $(all_objs:.o=.d) +-include $(deps) endif para_recv: $(recv_objs) @@ -242,7 +253,7 @@ 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) @[ -z "$(Q)" ] || echo 'LD $@' @@ -274,20 +285,20 @@ clean: clean2: clean @[ -z "$(Q)" ] || echo 'CLEAN2' - $(Q) rm -rf man $(object_dir) - $(Q) rm -f *_command_list.* + $(Q) rm -rf man $(object_dir) $(cmdline_dir) + $(Q) rm -f *_command_list.* $(ggo_generated) -distclean: clean2 +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 -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) @@ -295,21 +306,20 @@ install: all man $(install_sh) -m 644 $(man_pages) $(MANDIR) 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