X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=b865e4e8741c935d8397472cd0dca38fafb77f72;hp=e05a9bfba91cdcc842f84e8e83baee8be98ecd29;hb=46350883844352a1bcde8d13d680514aa3e54683;hpb=c2b50dd19a7f767adb15f9ac829d5ce6b45f8464 diff --git a/Makefile.in b/Makefile.in index e05a9bfb..b865e4e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,11 +8,11 @@ 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") @@ -22,6 +22,18 @@ codename := volatile relativity GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) +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 +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 @@ -66,37 +78,21 @@ CPPFLAGS += -I/usr/local/include CPPFLAGS += -I$(cmdline_dir) CPPFLAGS += @osl_cppflags@ -man_pages := $(patsubst %, man/man1/%.1, @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 ao_write -ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_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\ + 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),0) - Q = @ +ifeq ("$(origin V)", "command line") + Q := else - Q = + Q := @ endif .PHONY: dep all clean distclean maintainer-clean install man tarball @@ -105,7 +101,10 @@ dep: $(deps) man: $(man_pages) tarball: $(tarball) --include $(ggo_dir)/makefile +$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir): + $(Q) $(MKDIR_P) $@ + +-include $(m4_ggo_dir)/makefile # When in doubt, use brute force (Ken Thompson) TOUPPER = \ @@ -132,34 +131,19 @@ afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute. audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c 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) +$(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) +$(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 > $@ -man/man1/%.1: % | $(man_dir) +$(man_dir)/%.1: % | $(man_dir) @[ -z "$(Q)" ] || echo 'MAN $<' $(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@ -man/html/%.html: man/man1/%.1 - @[ -z "$(Q)" ] || echo 'MAN2HTML $<' - $(Q) mkdir -p man/html - $(Q) man2html $< > $@ - -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' > $@ - -$(object_dir): - mkdir -p $@ -$(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@ $< @@ -298,12 +282,12 @@ clean: clean2: clean @[ -z "$(Q)" ] || echo 'CLEAN2' - $(Q) rm -rf man $(object_dir) $(cmdline_dir) - $(Q) rm -f *_command_list.* *_completion.h $(ggo_generated) + $(Q) rm -rf $(man_dir) $(object_dir) $(cmdline_dir) $(ggo_dir) + $(Q) rm -f *_command_list.* *_completion.h 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 @@ -313,16 +297,16 @@ maintainer-clean: distclean 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): 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) + $(MKDIR_P) $(tarball_pfx) ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION cp -r $(autocrap) $(tarball_pfx) tar rf $(tarball_pfx).tar $(tarball_pfx)/*