[Gzz-commits] navidoc Makefile config.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/25 07:25:12

Modified files:
        .              : Makefile config.py 

Log message:
        javadoc

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/Makefile.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: navidoc/Makefile
diff -u navidoc/Makefile:1.14 navidoc/Makefile:1.15
--- navidoc/Makefile:1.14       Fri Apr 25 04:25:33 2003
+++ navidoc/Makefile    Fri Apr 25 07:25:12 2003
@@ -1,15 +1,6 @@
-#$Id: Makefile,v 1.14 2003/04/25 08:25:33 humppake Exp $
+#$Id: Makefile,v 1.15 2003/04/25 11:25:12 humppake Exp $
 
-all: java docs navilink
-
-docs:
-       make html RST="doc/"
-
-pegs:
-       make html RST="doc/pegboard/"
-
-navilink:
-       make navilink RST="doc/"
+all: java docs
 
 clean:
        @echo "Removing everything found in .cvsignores"
@@ -62,19 +53,44 @@
        $(JAVAC) -g -d $(CLASSDIR) `find org -name '*.java'`
 
 ##########################################################################
+# General documentation targets
+docs: java-doc navi-doc navilink
+
+DOCPKGS= org.nongnu.navidoc.util
+
+JAVADOCOPTS=-use -version -author -windowtitle "Navidoc Java API"
+java-doc:
+       find . -name '*.class' | xargs rm -f # Don't let javadoc see these
+       rm -Rf doc/javadoc
+       mkdir -p doc/javadoc
+       javadoc $(JAVADOCOPTS) -d doc/javadoc -sourcepath . $(DOCPKGS)
+
+navi-doc: # Compiles ReST into HTML
+       make html RST="doc/"
+
+navilink: # Bi-directional linking using imagemaps
+       make imagemap HTML="doc/"
+
+peg: # Creates a new PEG, uses python for quick use
+       make new-peg PEGDIR="doc/pegboard"
+
+pegs: # Complies only pegboard
+       make html RST="doc/pegboard/"
+#
+##########################################################################
 # Navidoc targets
-peg: # Creates new PEG, uses python for quick use
+new-peg: # Creates a new PEG, uses python for quick use
        $(PYTHON) newpeg.py $(PEGDIR)
-html: # converts ReST to HTML, directories are processed recursively
+html: # Compiles ReST into HTML, directories are processed recursively
        $(JYTHON) rst2any.py --html -d navidoc -d docutils -d pegboard -d 
pegboard.fail -d mp.fail $(DBG) $(RST)
 
 html-loop: # Loop version for quick recompiling
        $(JYTHON) rst2any.py --loop --html -d navidoc -d docutils -d pegboard 
-d pegboard.fail -d mp.fail $(DBG) $(RST)
 
-navilink: # Bi-directional linking using imagemaps
-       $(JYTHON) rst2any.py --imagemap -d navidoc -d mp.fail $(DBG) $(RST)
+imagemap: # Bi-directional linking using imagemaps
+       $(JYTHON) rst2any.py --imagemap -d navidoc -d mp.fail $(DBG) $(HTML)
 
-latex: # converts ReST to LaTeX, directories are processed recursively
+latex: # Compiles ReST into LaTeX, directories are processed recursively
        $(JYTHON) rst2any.py --latex -d navidoc -d docutils $(DBG) $(RST)
 
 latex-loop: # Loop version for quick recompiling
Index: navidoc/config.py
diff -u navidoc/config.py:1.19 navidoc/config.py:1.20
--- navidoc/config.py:1.19      Fri Apr 25 03:52:06 2003
+++ navidoc/config.py   Fri Apr 25 07:25:12 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.19 2003/04/25 07:52:06 humppake Exp $
+# $Id: config.py,v 1.20 2003/04/25 11:25:12 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -43,7 +43,13 @@
 mp_eps_only = 0
 
 # settings for linking javadoc
-javadoc_directories = ['../libvob/doc/javadoc']
+javadoc_directories = ['../libvob/doc/javadoc',
+                       '../storm/doc/javadoc',
+                       '../alph/doc/javadoc',
+                       '../loom/doc/javadoc',
+                       '../navidoc/doc/javadoc',
+                       '../fenfire/docs/javadoc'
+                       ]
 linkpackage = '' # dynamic
 
 # initializing dynamic settings