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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-10-25 14:36:34 -0700 (Mon, 25 Oct 2010)
New Revision: 44040

Modified:
   grass/trunk/Makefile
   grass/trunk/include/Make/Docs.make
   grass/trunk/include/Make/Doxyfile_arch_html.in
   grass/trunk/include/Make/Doxyfile_arch_latex.in
   grass/trunk/include/Make/Doxygen.make
Log:
attempt to recover programmers manual


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2010-10-25 21:34:01 UTC (rev 44039)
+++ grass/trunk/Makefile	2010-10-25 21:36:34 UTC (rev 44040)
@@ -122,10 +122,11 @@
 	-rm -f include/config.h include/version.h
 	-rm -f include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex 2>/dev/null
 
-DOXNAME=grass
-
 include $(MODULE_TOPDIR)/include/Make/Install.make
 include $(MODULE_TOPDIR)/include/Make/Docs.make
+include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
+DOXNAME=grass
+
 .PHONY: default libs
 .PHONY: cleandistdirs cleanscriptstrings clean libsclean distclean

Modified: grass/trunk/include/Make/Docs.make
===================================================================
--- grass/trunk/include/Make/Docs.make	2010-10-25 21:34:01 UTC (rev 44039)
+++ grass/trunk/include/Make/Docs.make	2010-10-25 21:36:34 UTC (rev 44040)
@@ -8,13 +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 \
 	lib/g3d \
@@ -34,25 +33,26 @@
 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/trunk/include/Make/Doxyfile_arch_html.in
===================================================================
--- grass/trunk/include/Make/Doxyfile_arch_html.in	2010-10-25 21:34:01 UTC (rev 44039)
+++ grass/trunk/include/Make/Doxyfile_arch_html.in	2010-10-25 21:36:34 UTC (rev 44040)
@@ -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/trunk/include/Make/Doxyfile_arch_latex.in
===================================================================
--- grass/trunk/include/Make/Doxyfile_arch_latex.in	2010-10-25 21:34:01 UTC (rev 44039)
+++ grass/trunk/include/Make/Doxyfile_arch_latex.in	2010-10-25 21:36:34 UTC (rev 44040)
@@ -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/trunk/include/Make/Doxygen.make
===================================================================
--- grass/trunk/include/Make/Doxygen.make	2010-10-25 21:34:01 UTC (rev 44039)
+++ grass/trunk/include/Make/Doxygen.make	2010-10-25 21:36:34 UTC (rev 44040)
@@ -8,12 +8,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)
@@ -22,7 +22,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
@@ -34,7 +34,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
@@ -46,5 +46,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