From: Andre Noll Date: Mon, 29 Oct 2007 13:40:46 +0000 (+0100) Subject: Makefile.in: Get rid of web-related targets and variables. X-Git-Tag: v0.3.0~175 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=b60fa2afaa5737c21ae96b44e82c965b75ad538e;p=paraslash.git Makefile.in: Get rid of web-related targets and variables. This is now handled by a shell script. --- diff --git a/Makefile.in b/Makefile.in index 190e1fc3..fee1bdef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,40 +53,21 @@ BINARIES = para_server para_client para_audioc para_recv \ para_filter para_write para_fsck @extra_binaries@ man_binaries := $(BINARIES) man_pages := $(patsubst %, man/man1/%.1, $(man_binaries)) -man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries)) man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries)) gengetopts := $(wildcard *.ggo) gengetopts_c := $(gengetopts:.ggo=.cmdline.c) gengetopts_h := $(gengetopts:.ggo=.cmdline.h) -grutatxt := NEWS CREDITS INSTALL README FEATURES REQUIREMENTS README.afs -grutatxt_html := $(grutatxt:=.html) -html_in := $(wildcard web/*.in.html) $(man_pages_in) -gen_html := $(subst web/,web/sync/,$(html_in)) -gen_html := $(gen_html:.in.html=.html) -gruta_in := $(grutatxt:=.in.html) -gruta_in := $(patsubst %,web/%,$(gruta_in)) -gruta_html := $(grutatxt:=.html) -gruta_html := $(patsubst %,web/sync/%,$(gruta_html)) -shots := gui-2005-11-12.png para_audiod-startup.txt para_server-startup.txt -shots := $(patsubst %,web/sync/%,$(shots)) -web_pics := web/sync/paraslash.png web/sync/paraslash.ico -web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \ - key.anonymous para.css -web_misc := $(patsubst %,web/sync/%,$(web_misc)) autocrap := config.h.in configure tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@ tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete)) tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap) +tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 -.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \ - man html_man +.PHONY: clean distclean maintainer-clean install man tarball all: $(BINARIES) -www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) \ - tags doxygen -gruta: $(gen_html) $(gruta_html) man: $(man_pages) -html_man: $(man_pages_html) +tarball: $(tarball) fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o fsck_objs = osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o @@ -133,7 +114,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo audioc.ggo) O="--unamed-opts=command";; \ fsck.ggo) O="--unamed-opts=table";; \ esac; \ - echo "$O"; if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \ + if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \ gengetopt $$O \ --no-handle-version \ --file-name=$(*F).cmdline \ @@ -239,9 +220,9 @@ distclean: clean maintainer-clean: distclean rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \ - $(grutatxt_html) config.h configure \ + config.h configure \ config.h.in skencil/*.pdf skencil/*.ps - rm -f *_command_list.* *.man man/man1/* man/html/* + rm -f *_command_list.* *.man man/man1/* web_sync install: all man @@ -263,38 +244,3 @@ install: all man bzip2 -9 $(tarball_pfx).tar rm -f $(tarball_pfx).tar ls -l $(tarball_pfx).tar.bz2 - -web/%.in.html: % - grutatxt -nb < $< > $@ -tags: - rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync -web/header2.html: web/header.html - sed -e 's|href="|href="\.\.\/\.\./|g' \ - -e 's|SRC="|SRC="\.\.\/\.\./|g' $< > $@ -doxygen: web/header2.html - mkdir -p web/sync/doxygen - doxygen -web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync - mkdir -p web/sync - cat web/header.html $< web/footer.html > $@ -web/sync/%: pics/web/% - mkdir -p web/sync - cp $< $@ -web/sync/%: pics/screenshots/% - mkdir -p web/sync - cp $< $@ -web/sync/%: web/% - mkdir -p web/sync - cp $< $@ -web/sync/%: % - mkdir -p web/sync - cp -a $< $@ -web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync - cp -a versions web/sync && cp $< $@ -web/sync/overview.pdf: skencil/overview.sk - mkdir -p web/sync - cp $< $@ -%.ps: %.sk - sk2ps $< > $@ -%.pdf: %.ps - ps2pdf - - < $< > $@