Mercurial > forge

changeset 9985:d536d4fa192a octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restructuring documentation dir
author mmarzolla
date Fri, 06 Apr 2012 16:54:31 +0000
parents f1ba108476f9
children 3bb7df5d0a96
files main/queueing/Makefile main/queueing/doc/Makefile main/queueing/doc/demos/Makefile main/queueing/doc/help/Makefile
diffstat 4 files changed, 43 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/main/queueing/Makefile	Fri Apr 06 16:16:17 2012 +0000
+++ b/main/queueing/Makefile	Fri Apr 06 16:54:31 2012 +0000
@@ -5,7 +5,7 @@
 DISTNAME=$(PROGNAME)-$(VERSIONNUM)
 SUBDIRS=inst doc test devel
 DISTFILES=COPYING NEWS DESCRIPTION
-DISTSUBDIRS=inst doc
+DISTSUBDIRS=inst doc doc/demos doc/help
 
 .PHONY: clean check
 
--- a/main/queueing/doc/Makefile	Fri Apr 06 16:16:17 2012 +0000
+++ b/main/queueing/doc/Makefile	Fri Apr 06 16:54:31 2012 +0000
@@ -1,6 +1,7 @@
 DOC=queueing
 CHAPTERS=$(wildcard *.texi)
-DISTFILES=README INSTALL $(DOC).pdf $(DOC).html $(DOC).texi $(CHAPTERS) demos/ help/
+DISTFILES=README INSTALL $(DOC).pdf $(DOC).html $(DOC).texi $(CHAPTERS)
+SUBDIRS=demos help
 
 .PHONY: clean dist
 
@@ -16,26 +17,32 @@
 	-$(MAKEINFO) -D INSTALLONLY \
 	  --no-validate --no-headers --no-split --output INSTALL $<
 
-$(DOC).html: $(DOC).texi $(CHAPTERS) DEMOS HELP
+$(DOC).html: $(DOC).texi $(CHAPTERS) demos/DONE help/DONE
 	-$(MAKEINFO) --html --no-split $(DOC).texi
 
-$(DOC).pdf: $(DOC).texi $(CHAPTERS) DEMOS HELP
+$(DOC).pdf: $(DOC).texi $(CHAPTERS) demos/DONE help/DONE
 	texi2pdf  -o $(DOC).pdf $(DOC).texi
 
-$(DOC).info: $(DOC).texi $(CHAPTERS) DEMOS HELP
+$(DOC).info: $(DOC).texi $(CHAPTERS) demos/DONE help/DONE
 	-$(MAKEINFO) $(DOC).texi
 
-DEMOS:
-	cd demos && octave -p ../../inst/ -q ../grabdemo.m ../../inst/ && touch ../DEMOS
+demos/DONE:
+	$(MAKE) -C demos
 
-HELP:
-	cd help && octave -p ../../inst/ -q ../grabhelp.m ../../inst/ && touch ../HELP
+help/DONE:
+	$(MAKE) -C help
 
 dist:
 	ln $(DISTFILES) ../`cat ../fname`/doc/
 
 clean:
-	\rm -f *.fns *.pdf *.aux *.log *.dvi *.out *.info *.html *.ky *.tp *.toc *.vr *.cp *.fn *.pg *.op *.au *.aus *.cps x.log *~ demos/*.texi help/*.texi DOCSTRINGS DEMOS HELP INSTALL
+	for d in $(SUBDIRS); do \
+		$(MAKE) -C $$d $(MAKECMDGOALS); \
+	done
+	\rm -f *.fns *.pdf *.aux *.log *.dvi *.out *.info *.html *.ky *.tp *.toc *.vr *.cp *.fn *.pg *.op *.au *.aus *.cps x.log *~ DOCSTRINGS DEMOS HELP INSTALL
 
 distclean: clean
+	for d in $(SUBDIRS); do \
+		$(MAKE) -C $$d $(MAKECMDGOALS); \
+	done
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/queueing/doc/demos/Makefile	Fri Apr 06 16:54:31 2012 +0000
@@ -0,0 +1,13 @@
+DISTFILES=$(wildcard *.texi)
+
+ALL:
+	octave -p ../../inst/ -q ../grabdemo.m ../../inst/ && touch DONE
+
+dist:
+	ln $(DISTFILES) ../../`cat ../../fname`/doc/demos
+
+clean:
+	\rm -f *.texi *~ DONE
+
+distclean: clean
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/queueing/doc/help/Makefile	Fri Apr 06 16:54:31 2012 +0000
@@ -0,0 +1,13 @@
+DISTFILES=$(wildcard *.texi)
+
+ALL:
+	octave -p ../../inst/ -q ../grabhelp.m ../../inst/ && touch DONE
+
+dist:
+	ln $(DISTFILES) ../../`cat ../../fname`/doc/help
+
+clean:
+	\rm -f *.texi *~ DONE
+
+distclean: clean
+