From e962f0387cc670c96165383a1f9a8ae5251bd1ec Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Sep 2014 13:38:42 -0500 Subject: [PATCH 23/24] make release/distclean targets suck less still more work to do --- Makefile.in | 2 +- scripts/Makefile.in | 19 +++++++++---------- tests/Makefile.in | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index 37a025b..25dc59f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,7 +10,7 @@ distclean: clean $(SUBDIRS:%=%/__distclean__) rm -f config.* Makefile rm -rf autom4te.cache -release: $(SUBDIRS:%=%/__release__) distclean +release: $(SUBDIRS:%=%/__release__) rm -f *~ help: diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 9a772bc..d167393 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -27,30 +27,29 @@ SCRIPTS = \ # xdg-terminal MANPAGES= $(SCRIPTS:%=man/%.1) -WEBPAGES= $(SCRIPTS:%=%.html) +WEBPAGES= $(SCRIPTS:%=html/%.html) XMLFILES= $(SCRIPTS:%=desc/%.xml) all: html man scripts -html: index.html $(WEBPAGES) +html: html/index.html $(WEBPAGES) scripts: README $(SCRIPTS) man: $(MANPAGES) release: scripts html man - rm -f xdg-*.in *~ HACKING generate-help-script.awk - rm -rf desc/ - rm -rf xsl/ + rm -f *~ + #rm -rf desc/ xsl/ rm -f xdg-file-dialog xdg-su xdg-copy xdg-terminal -distclean: clean - rm -f Makefile +distclean: clean + rm -f Makefile man/xdg-*.1 html/xdg-*.html clean: scripts-clean scripts-clean: - rm -f $(SCRIPTS) README man/xdg-*.1 html/xdg-*.html + rm -f $(SCRIPTS) README README: $(SCRIPTS) echo > $@ @@ -103,12 +102,12 @@ xdg-terminal: xdg-terminal.in xdg-utils-common.in man/%.1: desc/%.xml (cd man;$(XMLTO) man ../$<) -index.html: $(XMLFILES) +html/index.html: $(XMLFILES) (cat html/index.html.pre; \ xsltproc xsl/refentry2htmlindex.xsl $(XMLFILES); \ cat html/index.html.post ) > html/index.html -%.html: desc/%.xml +html/%.html: desc/%.xml (cd html;$(XMLTO) html-nochunks ../$<) %.txt: desc/%.xml diff --git a/tests/Makefile.in b/tests/Makefile.in index c57b0e0..a27504b 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -15,7 +15,7 @@ mandir = @mandir@ all: release: - rm -rf xdg-su tmp + rm -rf tmp rm -f xdg-test.log *~ test: -- 1.9.3