Browse Source

Clean up docs targets

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42982 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 years ago
parent
commit
f4f32d6ac3
2 changed files with 4 additions and 8 deletions
  1. 0 1
      Makefile
  2. 4 7
      include/Make/Docs.make

+ 0 - 1
Makefile

@@ -128,7 +128,6 @@ DOXNAME=grass
 
 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

+ 4 - 7
include/Make/Docs.make

@@ -6,12 +6,11 @@ HTML2PDF=		htmldoc --footer d.1
 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 @@ latexdocs_dirs := $(patsubst %,%/latex,$(docs_dirs))
 
 htmldocs:
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir cleandocs ; \
 	  $(MAKE) -C $$dir htmldocs ; \
 	  done
 
@@ -49,7 +47,6 @@ packagehtmldocs: htmldocs
 
 pdfdocs:
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir cleandocs ; \
 	  $(MAKE) -C $$dir pdfdocs ; \
 	  done
 	@echo "Written PDF docs in: $(latexdocs_dirs)"