SF.net SVN: safekeep: [310] safekeep/trunk

[<di...@us...>]

Revision: 310
          http://safekeep.svn.sourceforge.net/safekeep/?rev=310&view=rev
Author:   dimi
Date:     2007-01-26 13:13:27 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
Merge the doc Makefile into the main Makefile.
It makes it easier if everything is in one place.
http://members.canb.auug.org.au/~millerp/rmch/recu-make-cons-harm.html

Modified Paths:
--------------
    safekeep/trunk/Makefile

Removed Paths:
-------------
    safekeep/trunk/doc/Makefile

Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile	2007-01-26 20:35:46 UTC (rev 309)
+++ safekeep/trunk/Makefile	2007-01-26 21:13:27 UTC (rev 310)
@@ -10,13 +10,18 @@
 dirname     := $(shell basename $(PWD))
 rpmroot     := $(shell grep '%_topdir' ~/.rpmmacros | sed 's/^[^ \t]*[ \t]*//')
 svnroot     := $(shell  LANG=C svn info |grep Root |cut -c 18-)
+MAN_TXT     := doc/safekeep.txt
+DOC_HTML    := $(patsubst %.txt,%.html,$(MAN_TXT))
+DOC_MAN     := $(patsubst %.txt,%.1,$(MAN_TXT))
 
+
 all: help
 
 help:
 	@echo "Targets:"
 	@echo "    help        Displays this message"
 	@echo "    info        Displays package information (version, tag, etc.)"
+	@echo "    docs        Builds all documentation formats"
 	@echo "    build       Builds everything needed for an installation"
 	@echo "    deb         Builds snapshot binary and source DEBs"
 	@echo "    rpm         Buidls snapshot binary and source RPMs"
@@ -34,9 +39,9 @@
 	@echo "RPM Root       = $(rpmroot)"
 	@echo "SVN Root       = $(svnroot)"
 
-build:
-	$(MAKE) -C doc build
 
+build: docs
+
 release: check-info commit-release tag-release rpm-release
 
 commit-release:
@@ -49,6 +54,23 @@
 	@echo -n 'Is this information correct? (yes/No) '
 	@read x; if [ "$$x" != "yes" ]; then exit 1; fi
 
+docs: html man
+
+html: $(DOC_HTML)
+
+man: $(DOC_MAN)
+
+%.html: %.txt
+	asciidoc -b xhtml11 -d manpage -f doc/asciidoc.conf $<
+
+%.1: %.xml
+	xmlto -o doc -m doc/callouts.xsl man $<
+
+%.xml: %.txt
+	asciidoc -b docbook -d manpage -f doc/asciidoc.conf $<
+
+$(DOC_HTML) $(DOC_MAN): doc/asciidoc.conf
+
 tar: tar-snapshot
 
 tar-snapshot:
@@ -96,6 +118,6 @@
 	safekeep-test --remote
 
 clean:
-	$(MAKE) -C doc clean
-	rm -rf `find -name "*.py[co]" -o -name "*~"```
+	rm -f {.,doc,debian}/*~ *.py[co] 
 	rm -f $(name).spec debian/changelog
+	rm -f doc/*.xml doc/*.html doc/*.1

Deleted: safekeep/trunk/doc/Makefile
===================================================================
--- safekeep/trunk/doc/Makefile	2007-01-26 20:35:46 UTC (rev 309)
+++ safekeep/trunk/doc/Makefile	2007-01-26 21:13:27 UTC (rev 310)
@@ -1,25 +0,0 @@
-MAN_TXT  := $(wildcard *.txt)
-DOC_HTML := $(patsubst %.txt,%.html,$(MAN_TXT))
-DOC_MAN  := $(patsubst %.txt,%.1,$(MAN_TXT))
-
-all: html man
-
-build: all
-
-html: $(DOC_HTML)
-
-man: $(DOC_MAN)
-
-clean:
-	rm -f *.xml *.html *.1
-
-$(DOC_HTML) $(DOC_MAN): asciidoc.conf
-
-%.html: %.txt
-	asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
-
-%.1: %.xml
-	xmlto -m callouts.xsl man $<
-
-%.xml: %.txt
-	asciidoc -b docbook -d manpage -f asciidoc.conf $<


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.