X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2FSConscript;h=8d45689876c9dac31b77be1138bc3c744d59251a;hb=ad287a6e1241649e73188edf5b8902e4e65f615d;hp=1e76124e9c7597bb84aeea9522abc87e7cc20b37;hpb=3620d803f5953b10dcef01b011a587576ef7c5ec;p=senf.git

diff --git a/doclib/SConscript b/doclib/SConscript
index 1e76124..8d45689 100644
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -90,7 +90,12 @@
 #   '\code' and '<pre>' blocks. Additionally it will expand all tabs,
 #   tab width is 8 spaces (there should be no tabs in the source but
 #   ...)
-# 
+#
+# * 'site_scons/lib/filter.pl' calls 'site_scons/lib/makeDiaImageMap.py'
+#   whenever finding a '\diaimage' command. This will create an image
+#   map (in an encoded form which will be fixed by html-munge.xsl
+#   later)
+#
 # * doxygen calls 'site_scons/lib/dot' to generate the 'dot' images.
 #
 # * 'site_scons/lib/dot' calls 'site_scons/lib/dot-munge.pl' on the
@@ -266,20 +271,18 @@ env.Append( ENV = {
 })
 
 env.PhonyTarget('linklint', [], [
-    'rm -rf linklint',
-    'linklint -doc linklint -limit 99999999 `find -type d -name html -printf "/%P/@ "`',
-    '[ ! -r linklint/errorX.html ] || python doclib/linklint_addnames.py <linklint/errorX.html >linklint/errorX.html.new',
-    '[ ! -r linklint/errorX.html.new ] || mv linklint/errorX.html.new linklint/errorX.html',
-    '[ ! -r linklint/errorAX.html ] || python doclib/linklint_addnames.py <linklint/errorAX.html >linklint/errorAX.html.new',
-    '[ ! -r linklint/errorAX.html.new ] || mv linklint/errorAX.html.new linklint/errorAX.html',
-    'echo -e "\\nLokal link check results: linklint/index.html\\nRemote link check results: linklint/urlindex.html\\n"',
+    'rm -rf doc/linklint',
+    'linklint -doc doc/linklint -limit 99999999 `find -type d -name html -printf "/%P/@ "`',
+    '[ ! -r doc/linklint/errorX.html ] || python doclib/linklint_addnames.py <doc/linklint/errorX.html >doc/linklint/errorX.html.new',
+    '[ ! -r doc/linklint/errorX.html.new ] || mv doc/linklint/errorX.html.new doc/linklint/errorX.html',
+    '[ ! -r doc/linklint/errorAX.html ] || python doclib/linklint_addnames.py <doc/linklint/errorAX.html >doc/linklint/errorAX.html.new',
+    '[ ! -r doc/linklint/errorAX.html.new ] || mv doc/linklint/errorAX.html.new doc/linklint/errorAX.html',
 ])
 
 env.PhonyTarget('fixlinks', [], [
-    'python doclib/fix-links.py -v -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt',
+    'python doclib/fix-links.py -v -s .svn -s linklint -s debian doc/linklint/errorX.txt doc/linklint/errorAX.txt',
 ])
 
-
 header = env.Command('doxy-header.html', 'SConscript', writeTemplate,
                      TEMPLATE = Literal(HEADER),
                      TITLE = "Documentation and API reference")
@@ -318,3 +321,5 @@ env.Clean('all', 'doxy-header.html') # I should not need this but I do ...
 env.Clean('all_docs', 'doxy-header.html') # I should not need this but I do ...
 
 env.Install('${DOCINSTALLDIR}', 'index.html')
+
+env.Depends(SENFSCons.Doxygen(env, output_directory="../doc"), env.Value(env['ENV']['REVISION']))