[GRASS-SVN] r44539 - grass/branches/releasebranch_6_4/include/Make

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-12-04 14:00:52 -0800 (Sat, 04 Dec 2010)
New Revision: 44539

Modified:
   grass/branches/releasebranch_6_4/include/Make/Docs.make
   grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_html.in
   grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_latex.in
   grass/branches/releasebranch_6_4/include/Make/Doxygen.make
Log:
fix #1218 (make htmldocs generates Python and not C documentation)
(merge r44538 from devbr6)


Modified: grass/branches/releasebranch_6_4/include/Make/Docs.make
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Docs.make	2010-12-04 21:58:14 UTC (rev 44538)
+++ grass/branches/releasebranch_6_4/include/Make/Docs.make	2010-12-04 22:00:52 UTC (rev 44539)
@@ -8,12 +8,12 @@
 # generate programmer's manual as single HTML document:
 
 htmldocs-single:
+	$(MAKE) -C . htmldox-single
 	for dir in lib rfc gui/wxpython ; do \
-	  $(MAKE) -C $$dir htmldocs-single ; \
+	  $(MAKE) -C $$dir htmldox-single ; \
 	done
 
 # generate programmer's manual as multiple HTML documents:
-htmldocs:
 
 docs_dirs = \
 	lib/db \
@@ -28,32 +28,32 @@
 	lib/vector \
 	lib/vector/dglib \
 	gui/wxpython \
-	rfc \
-	swig
+	rfc
 
 htmldocs_dirs := $(patsubst %,%/html,$(docs_dirs))
 latexdocs_dirs := $(patsubst %,%/latex,$(docs_dirs))
 
 htmldocs:
+	$(MAKE) -C . htmldox
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir htmldocs ; \
+	  $(MAKE) -C $$dir htmldox ; \
 	  done
 
 packagehtmldocs: htmldocs
 	tar chvfz $(GRASS_NAME)refman_$(DATE)_html.tar.gz $(htmldocs_dirs)
 
 #alternatively, the docs can be generated as single PDF document (see doxygen FAQ for 'TeX capacity exceeded'):
-#  (cd lib/ ; make pdfdocs)
+#  (cd lib/ ; make pdfdox)
 
 pdfdocs:
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir pdfdocs ; \
+	  $(MAKE) -C $$dir pdfdox ; \
 	  done
 	@echo "Written PDF docs in: $(latexdocs_dirs)"
 
 cleandocs:
 	for dir in $(docs_dirs) ; do \
-	  $(MAKE) -C $$dir cleandocs ; \
+	  $(MAKE) -C $$dir cleandox ; \
 	  done
 
 indices = \

Modified: grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_html.in
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_html.in	2010-12-04 21:58:14 UTC (rev 44538)
+++ grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_html.in	2010-12-04 22:00:52 UTC (rev 44539)
@@ -448,17 +448,18 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = bin.* \
+EXCLUDE                = bin. at ARCH@ \
 		         db \
 			 debian \
 			 demolocation \
 			 display \
-			 dist.* \
+			 dist. at ARCH@ \
 			 doc \
 			 general \
 		         gui/wxpython/vdigit \
 			 gui/wxpython/nviz \
 			 imagery \
+			 include \
                          lib/python/ctypes \
 			 locale \
 			 macosx \

Modified: grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_latex.in
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_latex.in	2010-12-04 21:58:14 UTC (rev 44538)
+++ grass/branches/releasebranch_6_4/include/Make/Doxyfile_arch_latex.in	2010-12-04 22:00:52 UTC (rev 44539)
@@ -448,17 +448,18 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = bin.* \
+EXCLUDE                = bin. at ARCH@ \
 		         db \
 			 debian \
 			 demolocation \
 			 display \
-			 dist.* \
+			 dist. at ARCH@ \
 			 doc \
 			 general \
 		         gui/wxpython/vdigit \
 			 gui/wxpython/nviz \
 			 imagery \
+			 include \
                          lib/python/ctypes \
 			 locale \
 			 macosx \

Modified: grass/branches/releasebranch_6_4/include/Make/Doxygen.make
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Doxygen.make	2010-12-04 21:58:14 UTC (rev 44538)
+++ grass/branches/releasebranch_6_4/include/Make/Doxygen.make	2010-12-04 22:00:52 UTC (rev 44539)
@@ -9,12 +9,12 @@
 	@(type doxygen > /dev/null || (echo "ERROR: Install 'doxygen' software first (get from http://www.doxygen.org)" && exit 1))
 
 # generate docs as single HTML document:
-htmldocs-single: checkdoxygen cleandocs
+htmldox-single: checkdoxygen cleandox
 	doxygen $(MODULE_TOPDIR)/include/Make/Doxyfile_arch_html
 	@echo "HTML reference in directory ./html/index.html"
 
 # generate docs as multiple HTML documents:
-htmldocs: checkdoxygen cleandocs
+htmldox: checkdoxygen cleandox
 # hack needed to get main page at beginning:
 	@mv $(DOXINPUT) $(DOXINPUT).org
 	@sed 's+/\*! \\page +/\*! \\mainpage +g' $(DOXINPUT).org > $(DOXINPUT)
@@ -23,7 +23,7 @@
 	@echo "HTML reference in directory ./html/index.html"
 
 # NOTE: stubs/ and sqlp/ are excluded in ./Doxyfile_arch_latex
-latexdocs: checkdoxygen cleandocs
+latexdox: checkdoxygen cleandox
 	test ! -d latex || (cd ./latex && $(MAKE) clean)
 # hack needed to get main page at beginning:
 	@mv $(DOXINPUT) $(DOXINPUT).org
@@ -35,7 +35,7 @@
 	@mv $(DOXINPUT).org $(DOXINPUT)
 	@echo "Latex reference in directory ./latex/refman.dvi"
 
-pdfdocs: checkdoxygen cleandocs
+pdfdox: checkdoxygen cleandox
 	test ! -d latex || (cd ./latex && $(MAKE) clean)
 # hack needed to get main page at beginning:
 	@mv $(DOXINPUT) $(DOXINPUT).org
@@ -47,5 +47,5 @@
 	@mv $(DOXINPUT).org $(DOXINPUT)
 	@echo "PDF reference in directory ./latex/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}$(DOXOUTPUT)_`date '+%Y_%m_%d'`_refman.pdf"
 
-cleandocs:
+cleandox:
 	rm -rf ./latex ./html