Index: libaws-2.2/docs/makefile
===================================================================
--- libaws-2.2.orig/docs/makefile	2006-07-30 22:14:50.000000000 +0200
+++ libaws-2.2/docs/makefile	2006-07-30 22:15:09.000000000 +0200
@@ -1,6 +1,5 @@
 
-.SILENT:
-
+.SUFFIXES:
 
 BUILD_DOC_SCRIPT = true
 
@@ -14,88 +13,21 @@
 		subtype generic limited access all tagged abstract renames \
 		pragma new case when null
 
-APIFILES = ../src/aws.ads.texi \
-	../src/aws-attachments.ads.texi \
-	../src/aws-client.ads.texi \
-	../src/aws-client-hotplug.ads.texi \
-	../src/aws-communication-client.ads.texi \
-	../src/aws-communication-server.ads.texi \
-	../src/aws-communication.ads.texi \
-	../src/aws-config-ini.ads.texi \
-	../src/aws-config-set.ads.texi \
-	../src/aws-config.ads.texi \
-	../src/aws-containers-tables.ads.texi \
-	../src/aws-default.ads.texi \
-	../src/aws-dispatchers-callback.ads.texi \
-	../src/aws-dispatchers.ads.texi \
-	../src/aws-exceptions.ads.texi \
-	../src/aws-headers.ads.texi \
-	../src/aws-headers-values.ads.texi \
-	../src/aws-ldap-client.ads.texi \
-	../src/aws-log.ads.texi \
-	../src/aws-messages.ads.texi \
-	../src/aws-mime.ads.texi \
-	../src/aws-net.ads.texi \
-	../src/aws-net-buffered.ads.texi \
-	../src/aws-net-log.ads.texi \
-	../src/aws-net-log-callbacks.ads.texi \
-	../src/aws-net-ssl.ads.texi \
-	../src/aws-net-ssl-certificate.ads.texi \
-	../src/aws-parameters.ads.texi \
-	../src/aws-pop.ads.texi \
-	../src/aws-resources-files.ads.texi \
-	../src/aws-resources-embedded.ads.texi \
-	../src/aws-resources-streams.ads.texi \
-	../src/aws-resources-streams-disk.ads.texi \
-	../src/aws-resources-streams-disk-once.ads.texi \
-	../src/aws-resources-streams-memory.ads.texi \
-	../src/aws-resources-streams-memory-zlib.ads.texi \
-	../src/aws-resources.ads.texi \
-	../src/aws-response.ads.texi \
-	../src/aws-server-hotplug.ads.texi \
-	../src/aws-server-push.ads.texi \
-	../src/aws-server-status.ads.texi \
-	../src/aws-server-log.ads.texi \
-	../src/aws-server.ads.texi \
-	../src/aws-services-callbacks.ads.texi \
-	../src/aws-services-directory.ads.texi \
-	../src/aws-services-dispatchers-linker.ads.texi \
-	../src/aws-services-dispatchers-method.ads.texi \
-	../src/aws-services-dispatchers-uri.ads.texi \
-	../src/aws-services-dispatchers-virtual_host.ads.texi \
-	../src/aws-services-dispatchers.ads.texi \
-	../src/aws-services-download.ads.texi \
-	../src/aws-services-page_server.ads.texi \
-	../src/aws-services-split_pages.ads.texi \
-	../src/aws-services-split_pages-uniform.ads.texi \
-	../src/aws-services-split_pages-uniform-alpha.ads.texi \
-	../src/aws-services-split_pages-uniform-overlapping.ads.texi \
-	../src/aws-services-split_pages-alpha.ads.texi \
-	../src/aws-services-split_pages-alpha-bounded.ads.texi \
-	../src/aws-services-transient_pages.ads.texi \
-	../src/aws-session.ads.texi \
-	../src/aws-smtp-client.ads.texi \
-	../src/aws-smtp.ads.texi \
-	../src/aws-status.ads.texi \
-	../src/aws-templates.ads.texi \
-	../src/aws-translator.ads.texi \
-	../src/aws-url.ads.texi \
-	../xsrc/aws-jabber.ads.texi \
-	../soap/soap.ads.texi \
-	../soap/soap-client.ads.texi \
-	../soap/soap-dispatchers.ads.texi \
-	../soap/soap-dispatchers-callback.ads.texi \
-	../soap/soap-message-xml.ads.texi \
-	../soap/soap-message.ads.texi \
-	../soap/soap-parameters.ads.texi \
-	../soap/soap-types.ads.texi
-
-build_doc: $(APIFILES) aws_docs sg_docs
-	echo ""
-	echo AWS Documentation built with success.
-	${MAKE} -C ../templates_parser doc
+DIRS := ../src ../wsrc ../soap ../ssl ../xsrc
+vpath %.ads $(DIRS) ../include
+
+APIREFS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.ads)) \
+	$(wildcard ../include/strings_cutter.ads) \
+	$(wildcard ../include/zlib*.ads) \
+	$(wildcard ../include/memory_streams.ads)
+
+APIFILES := $(foreach f,$(APIREFS),$(notdir $(f)).texi)
 
-aws_docs: aws.texi aws.pdf aws.ps aws.html aws.txt aws.info
+build_doc: aws_docs sg_docs
+	@echo ""
+	@echo AWS Documentation built with success.
+
+aws_docs: aws.pdf aws.ps aws.html aws.txt aws.info
 
 force:
 
@@ -122,12 +54,9 @@
 %.ads.texi: %.ads ada.sed gentexifile
 	./gentexifile $< NOGROUP
 
-%.adb.texi: %.adb ada.sed gentexifile
-	./gentexifile $< NOGROUP
-
 %.dvi: %.texi
 ifneq (${TEXI2DVI},)
-	echo Building $@
+	@echo Building $@
 	-${TEXI2DVI} --expand --clean --quiet $<
 else
 	@echo "--------------------------------------------------------"
@@ -137,7 +66,7 @@
 
 %.ps: %.dvi
 ifneq (${DVIPS},)
-	echo Building $@
+	@echo Building $@
 	-${DVIPS} -q $< -o $@
 else
 	@echo "------------------------------------------------------"
@@ -148,7 +77,7 @@
 %.pdf: %.texi
 ifneq (${TEXI2DVI},)
 ifneq (${PDFTEX},)
-	echo Building $@
+	@echo Building $@
 	${TEXI2DVI} -p --expand --clean --quiet $<
 else
 	@echo "------------------------------------------------"
@@ -163,8 +92,8 @@
 
 %.info: %.texi
 ifneq (${MAKEINFO},)
-	echo Building $@
-	-${MAKEINFO} $<
+	@echo Building $@
+	-${MAKEINFO} --no-split $<
 else
 	@echo "---------------------------------------------------"
 	@echo "makeinfo not found, cannot build INFO documentation"
@@ -173,7 +102,7 @@
 
 %.html: %.texi
 ifneq (${MAKEINFO},)
-	echo Building $@
+	@echo Building $@
 	-${MAKEINFO} --html --no-split --css-include=aws.css --ifinfo $<
 else
 	@echo "---------------------------------------------------"
@@ -183,7 +112,7 @@
 
 %.txt: %.texi
 ifneq (${MAKEINFO},)
-	echo Building $@
+	@echo Building $@
 	-${MAKEINFO} --plaintext --no-headers $< --output $@
 else
 	@echo "---------------------------------------------------"
@@ -198,11 +127,11 @@
 
 ifeq (${BUILD_DOC_SCRIPT},false)
 aws.texi: prog aws.texi.tmplt
-	echo build from ada
+	@echo build from ada
 	./build | tr -d '\r' > aws.texi
 else
 aws.texi: aws.texi.tmplt
-	echo build from script
+	@echo build from script
 	sed -f ./gen_doc.sed < aws.texi.tmplt > aws.texi
 endif
 
@@ -214,60 +143,13 @@
 		exit 1; \
 	fi;
 
-# apiref can be set to gnathtml_apiref or adabrowse_apiref to select the tool
-# used to generate the API cross-reference.
-apiref: gnathtml_apiref
-
-APIREFS = src/a*.ad[sb] templates_parser/src/templates*.ad[sb] xsrc/*.ad* \
-	   	include/strings_cutter.ad[sb] include/zlib*.ad[sb] \
-		include/memory_streams.ad[sb] \
-		soap/soap*.ad[sb] templates_parser/xsrc/templates*.ad[sb]
-
-pref1	= $(BDIR)/obj
-pref2	= $(BDIR)/include
-
-# API cross-references using gnathtml
-
-gnathtml_apiref: check_api
-	(cd ..; fileset=; \
-	for file in $(APIREFS); do \
-		echo -n $$file; \
-		bfile=`basename $$file | sed -e 's/\.ad[sb]/.ali/'`; \
-		if [ -f $(pref1)/$$bfile ] || [ -f $(pref2)/$$bfile ]; then \
-			echo "    included"; \
-			fileset="$$fileset `basename $$file`"; \
-		else \
-			echo "    skipped"; \
-		fi; \
-	done; \
-	gnathtml.pl -Isrc -Iinclude -Isoap -Ixsrc -I$(pref1) -I$(pref2) \
-		-Itemplates_parser/src -Itemplates_parser/xsrc \
-		-odocs/html $$fileset; \
-	)
-	$(MV) html/index.htm html/aws_index.htm
-
-# API cross-references using AdaBrowse
-
-adabrowse_apiref: check_api
-	(cd ..; \
-	for file in $(APIREFS); \
-	do \
-		echo -n $$file; \
-		if [ -f `echo $$file | sed -e 's/\.ad[sb]/.ali/'` ]; then \
-			echo "    included"; \
-			adabrowse -o docs\\html\\ -f $$file -Isrc -Iinclude \
-			   -Itemplates_parser/src -Itemplates_parser/xsrc; \
-		else \
-			echo "    skipped"; \
-		fi; \
-	done; \
-	)
+aws.info aws.pdf aws.dvi aws.txt aws.html: $(APIFILES)
 
 clean:
-	-$(RM) -f aws.texi aws.dvi aws.html aws.info* aws.log aws.ps aws.txt \
-          $(APIFILES) *~ *.o *.ali genout
+	-$(RM) -f aws.texi aws.dvi aws.html aws.info* aws.log aws.ps aws.txt aws.pdf
+	-$(RM) -f *.ads.texi *~ *.o *.ali genout .ads.texi ada.sed
 	-$(RM) -f style-guide.dvi style-guide.html style-guide.info* \
-		style-guide.log style-guide.ps style-guide.txt
+		style-guide.log style-guide.ps style-guide.pdf style-guide.txt
 
 clean_apiref:
 	-$(RM) -fr html
Index: libaws-2.2/docs/aws.texi.tmplt
===================================================================
--- libaws-2.2.orig/docs/aws.texi.tmplt	2006-08-09 18:22:25.000000000 +0200
+++ libaws-2.2/docs/aws.texi.tmplt	2006-08-09 18:23:44.000000000 +0200
@@ -10,6 +10,11 @@
 @afourpaper
 @end iftex
 
+@dircategory GNU Ada tools
+@direntry
+* AWS: (aws).    The Ada Web Server.
+@end direntry
+
 @c ----------------------------------------- MACRO
 
 @c Macro used for all AWS examples
Index: libaws-2.2/docs/style-guide.texi
===================================================================
--- libaws-2.2.orig/docs/style-guide.texi	2006-08-09 18:26:38.000000000 +0200
+++ libaws-2.2/docs/style-guide.texi	2006-08-09 18:27:25.000000000 +0200
@@ -17,6 +17,11 @@
 @settitle AWS Coding Style
 @c %**end of header
 
+@dircategory GNU Ada tools
+@direntry
+* AWS Style Guide: (style-guide).    AWS Coding Style.
+@end direntry
+
 @ifinfo
      @center AWS Coding Style