updates.

diff --git a/lib/silcutil/DIRECTORY b/lib/silcutil/DIRECTORY
index f95ddcc7ca10befb71fc43b7d8bc328d35af9888..99b7cf897ef5d2b224de090ca81bf0c457a06f12 100644 (file)
--- a/lib/silcutil/DIRECTORY
+++ b/lib/silcutil/DIRECTORY
@@ -3,19 +3,19 @@
 @FILENAME=silcutillib.html
 @LINK=silcbuffer.html:SILC Buffer API
 @LINK=silcbuffmt.html:SILC Buffer Format API
-@LINK=silcbufutil.html:SILC Buffer Utility API
-@LINK=silchashtable.html:SILC Hash Table API
-@LINK=silclog.html:SILC Log and Debug API
-@LINK=silcmemory.html:SILC Memory API
-@LINK=silcmutex.html:SILC Mutex API
-@LINK=silcthread.html:SILC Thread API
-@LINK=silcnet.html:SILC Net API
-@LINK=silcschedule.html:SILC Schedule API
-@LINK=silcsockconn.html:SILC Socket Connection API
-@LINK=silcutil.html:SILC Util API
-@LINK=silczip.html:SILC Zip API
-@LINK=silclist.html:SILC List API
-@LINK=silcdlist.html:SILC Dynamic List API
+@LINK="silcbufutil.html:SILC Buffer Utility API
+@LINK="silchashtable.html:SILC Hash Table API
+@LINK="silclog.html:SILC Log and Debug API
+@LINK="silcmemory.html:SILC Memory API
+@LINK="silcmutex.html:SILC Mutex API
+@LINK="silcthread.html:SILC Thread API
+@LINK="silcnet.html:SILC Net API
+@LINK="silcschedule.html:SILC Schedule API
+@LINK="silcsockconn.html:SILC Socket Connection API
+@LINK="silcutil.html:SILC Util API
+@LINK="silczip.html:SILC Zip API
+@LINK="silclist.html:SILC List API
+@LINK="silcdlist.html:SILC Dynamic List API
 -->
 
 <OL>

diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc
index 3ad16e63cc852b76447725de4ef341ff66c044f6..0682dec0abc0a5419f2a764a4b991d83246a9c31 100755 (executable)
--- a/scripts/silcdoc/silcdoc
+++ b/scripts/silcdoc/silcdoc
@@ -74,17 +74,20 @@ if [ "$TYPE" = "HTML" ]; then
     # Get library name
     name=`grep "@LIBRARY=" $i |cut -d=  -f2`
     fname=`grep "@FILENAME=" $i |cut -d=  -f2`
-    links=`grep "@LINK=" $i |cut -d=  -f2`
+    links=`grep "@LINK=" $i |cut -d=  -f2 |cut -d:  -f1`
+
+    # Generate links to template file that can be included into various
+    # places on the webpage.
+    echo ">> <A HREF="$fname">$name</A><BR>" >>$DST/index.tmpl
 
     # Generate links for this library
     for k in $links
     do
-      l=`echo $k |cut -d:  -f1`
-      n=`echo $k |cut -d:  -f2`
-      echo "<LI><A HREF="$l">$n</A>" >>$DST/$fname.links
+      n=`grep $k $i |cut -d=  -f2 |cut -d:  -f2`
+      echo "<LI><A HREF="$k">$n</A>" >>$DST/$fname.links
+      echo "&nbsp;&nbsp;> <A HREF="$k">$n</A><BR>" >>$DST/index.tmpl
     done
     sed -e "/@LINKS@/ r $DST/$fname.links" -e s/@LINKS@//g $i >$DST/$fname
-    rm -f $DST/$fname.links
 
     # Generate the TOC file for the library
     sh gen.sh gen_toc.php $DST/$fname $DST/$fname
@@ -92,6 +95,7 @@ if [ "$TYPE" = "HTML" ]; then
 
     # Generate the link for the top index.html for this library
     echo "<LI><A HREF="$fname">$name</A>" >>$DST/index.html.tmp
+    rm -f $DST/$fname.links
   done
 
   # Generate the top index.html file