[GRASS-SVN] r42982 - in grass/trunk: . include/Make

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-08-03 12:22:08 +0000 (Tue, 03 Aug 2010)
New Revision: 42982

Modified:
   grass/trunk/Makefile
   grass/trunk/include/Make/Docs.make
Log:
Clean up docs targets


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2010-08-03 10:43:15 UTC (rev 42981)
+++ grass/trunk/Makefile	2010-08-03 12:22:08 UTC (rev 42982)
@@ -128,7 +128,6 @@
 
 include $(MODULE_TOPDIR)/include/Make/Install.make
 include $(MODULE_TOPDIR)/include/Make/Docs.make
-include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
 .PHONY: default libs
 .PHONY: cleandistdirs cleanscriptstrings clean libsclean distclean

Modified: grass/trunk/include/Make/Docs.make
===================================================================
--- grass/trunk/include/Make/Docs.make	2010-08-03 10:43:15 UTC (rev 42981)
+++ grass/trunk/include/Make/Docs.make	2010-08-03 12:22:08 UTC (rev 42982)
@@ -6,12 +6,11 @@
 GRASS_PDFDIR=		$(DOCSDIR)/pdf
 
 # generate programmer's manual as single HTML document:
-include $(MODULE_TOPDIR)/include/Make/Doxygen.make
+
 htmldocs-single:
-	(cd lib/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
-	(cd rfc/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
-	(cd gui/wxpython/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
-	(cd swig/; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
+	for dir in lib rfc gui/wxpython ; do \
+	  $(MAKE) -C $$dir htmldocs-single ; \
+	done
 
 # generate programmer's manual as multiple HTML documents:
 htmldocs:
@@ -37,7 +36,6 @@
 
 htmldocs:
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir cleandocs ; \
 	  $(MAKE) -C $$dir htmldocs ; \
 	  done
 
@@ -49,7 +47,6 @@
 
 pdfdocs:
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir cleandocs ; \
 	  $(MAKE) -C $$dir pdfdocs ; \
 	  done
 	@echo "Written PDF docs in: $(latexdocs_dirs)"