X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=7a23832b124b8b09a99d43e10398bf764a303cc3;hp=6794efedf7c5a31cbb8be27b1cb28fec2515a5b8;hb=1d54a5412ef39590022e6dd4448881f267e96d0b;hpb=3e7e85f851a019c7a0ad8e5ccbd53909a93ace8e diff --git a/Makefile.in b/Makefile.in index 6794efed..7a23832b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,15 +9,21 @@ PACKAGE_VERSION := @PACKAGE_VERSION@ PACKAGE_STRING := @PACKAGE_STRING@ install_sh := @install_sh@ cmdline_dir := @cmdline_dir@ +executables := @executables@ 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 := nested assignment -DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W +GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) + +DEBUG_CPPFLAGS += -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls +DEBUG_CPPFLAGS += -Wall -Wno-sign-compare +DEBUG_CPPFLAGS += -Wformat-security +DEBUG_CPPFLAGS += -Wmissing-format-attribute # produces false positives # DEBUG_CPPFLAGS += -Wunreachable-code # DEBUG_CPPFLAGS += -Wwrite-strings @@ -26,6 +32,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,42 +44,34 @@ 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)"' -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 +test_dir := t -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 \ +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))) @@ -96,23 +95,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: $(BINARIES) $(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 -$(BINARIES): GIT-VERSION-FILE - -include $(ggo_dir)/makefile %_command_list.c: %.cmd @@ -156,13 +150,32 @@ $(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@ $< + +$(object_dir)/spxdec_filter.o: spxdec_filter.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< + +$(object_dir)/spx_afh.o: spx_afh.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< + $(object_dir)/oggdec_filter.o: oggdec_filter.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' - $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $< + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< $(object_dir)/ogg_afh.o: ogg_afh.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' - $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $< + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< + +$(object_dir)/ogg_afh_common.o: ogg_afh_common.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< $(object_dir)/mp3dec_filter.o: mp3dec_filter.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' @@ -180,24 +193,29 @@ $(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) -o $@ $< + $(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -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) +$(object_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(object_dir) @[ -z "$(Q)" ] || echo 'DEP $<' - $(Q) ./depend.sh $(object_dir) $(CPPFLAGS) $< > $@ + $(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@ -$(object_dir)/%.d: %.c $(cmdline_generated) | $(object_dir) +$(object_dir)/%.d: %.c | $(object_dir) @[ -z "$(Q)" ] || echo 'DEP $<' - $(Q) ./depend.sh $(object_dir) $(CPPFLAGS) $< > $@ + $(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@ + recv_objs := $(addprefix $(object_dir)/, @recv_objs@) filter_objs := $(addprefix $(object_dir)/, @filter_objs@) @@ -211,9 +229,14 @@ 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) --include $(all_objs:.o=.d) + +deps := $(all_objs:.o=.d) + +ifeq ($(findstring clean, $(MAKECMDGOALS)),) +-include $(deps) +endif para_recv: $(recv_objs) @[ -z "$(Q)" ] || echo 'LD $@' @@ -229,7 +252,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 $@' @@ -257,14 +280,14 @@ para_afh: $(afh_objs) clean: @[ -z "$(Q)" ] || echo 'CLEAN' - $(Q) rm -f $(BINARIES) $(object_dir)/*.o + $(Q) rm -f @executables@ $(object_dir)/*.o clean2: clean @[ -z "$(Q)" ] || echo 'CLEAN2' $(Q) rm -rf man $(object_dir) $(Q) rm -f *_command_list.* -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 @@ -278,7 +301,7 @@ maintainer-clean: distclean install: all man mkdir -p $(BINDIR) $(MANDIR) - $(install_sh) -s -m 755 $(BINARIES) $(BINDIR) + $(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 @@ -287,7 +310,7 @@ $(tarball): $(cmdline_generated) 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 + ./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)/* @@ -300,3 +323,4 @@ $(tarball): $(cmdline_generated) %.pdf: %.ps ps2pdf - - < $< > $@ +include $(test_dir)/makefile.test