X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;h=ed0b9b0562a75adc745d3c1f404d5e75529fd4eb;hb=66b0f375732897cb76cfbefbb03ed951c4ed24ba;hp=868cfeac5ad719545b210982fcc934e58b53af3c;hpb=2ce04a49091712719b8fd60a6c7888258b719db1;p=paraslash.git diff --git a/Makefile.in b/Makefile.in index 868cfeac..ed0b9b05 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,7 +8,6 @@ MANDIR := @datarootdir@/man/man1 PACKAGE_VERSION := @PACKAGE_VERSION@ PACKAGE_STRING := @PACKAGE_STRING@ install_sh := @install_sh@ -cmdline_dir := @cmdline_dir@ executables := @executables@ GENGETOPT := @gengetopt@ @@ -18,10 +17,17 @@ 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 := mutual diversity +codename := volatile relativity GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) +m4_ggo_dir := ggo +ggo_dir := ggo +object_dir := objects +man_dir := man/man1 +test_dir := t +cmdline_dir := cmdline + DEBUG_CPPFLAGS += -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas @@ -68,21 +74,10 @@ 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 -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))) - 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 @@ -108,7 +103,7 @@ dep: $(deps) man: $(man_pages) tarball: $(tarball) --include $(ggo_dir)/makefile +-include $(m4_ggo_dir)/makefile # When in doubt, use brute force (Ken Thompson) TOUPPER = \ @@ -148,16 +143,6 @@ man/man1/%.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): @@ -302,7 +287,7 @@ 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 -f *_command_list.* *_completion.h $(ggo_dir)/*.ggo distclean: clean2 test-clean @[ -z "$(Q)" ] || echo 'DISTCLEAN' $(Q) rm -f Makefile autoscan.log config.status config.log