Index: /trunk/FACT++/aminclude.am
===================================================================
--- /trunk/FACT++/aminclude.am	(revision 14527)
+++ /trunk/FACT++/aminclude.am	(revision 14528)
@@ -2,47 +2,75 @@
 ## Format-independent Doxygen rules. ##
 ## --------------------------------- ##
+
 if DX_COND_doc
-@DX_CONFIG@:
-	$(DX_DOXYGEN) -g
+
 ## ------------------------------- ##
 ## Rules specific for HTML output. ##
 ## ------------------------------- ##
+
 if DX_COND_html
+
 DX_CLEAN_HTML = @DX_DOCDIR@/html
+
 endif DX_COND_html
+
 ## ------------------------------ ##
 ## Rules specific for CHM output. ##
 ## ------------------------------ ##
+
 if DX_COND_chm
+
 DX_CLEAN_CHM = @DX_DOCDIR@/chm
+
 if DX_COND_chi
+
 DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
+
 endif DX_COND_chi
+
 endif DX_COND_chm
+
 ## ------------------------------ ##
 ## Rules specific for MAN output. ##
 ## ------------------------------ ##
+
 if DX_COND_man
+
 DX_CLEAN_MAN = @DX_DOCDIR@/man
+
 endif DX_COND_man
+
 ## ------------------------------ ##
 ## Rules specific for RTF output. ##
 ## ------------------------------ ##
+
 if DX_COND_rtf
+
 DX_CLEAN_RTF = @DX_DOCDIR@/rtf
+
 endif DX_COND_rtf
+
 ## ------------------------------ ##
 ## Rules specific for XML output. ##
 ## ------------------------------ ##
+
 if DX_COND_xml
+
 DX_CLEAN_XML = @DX_DOCDIR@/xml
+
 endif DX_COND_xml
+
 ## ----------------------------- ##
 ## Rules specific for PS output. ##
 ## ----------------------------- ##
+
 if DX_COND_ps
+
 DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
+
 DX_PS_GOAL = doxygen-ps
+
 doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
+
 @DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
 	cd @DX_DOCDIR@/latex; \
@@ -53,18 +81,25 @@
 	countdown=5; \
 	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
-		refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \
+               refman.log > /dev/null 2>&1 && test $$countdown -gt 0; \
 	do \
-		$(DX_LATEX) refman.tex; \
-		countdown=`expr $$countdown - 1`; \
+	   $(DX_LATEX) refman.tex; \
+	   countdown=`expr $$countdown - 1`; \
 	done; \
 	$(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
+
 endif DX_COND_ps
+
 ## ------------------------------ ##
 ## Rules specific for PDF output. ##
 ## ------------------------------ ##
+
 if DX_COND_pdf
+
 DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
+
 DX_PDF_GOAL = doxygen-pdf
+
 doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
+
 @DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
 	cd @DX_DOCDIR@/latex; \
@@ -79,31 +114,43 @@
 		$(DX_PDFLATEX) refman.tex; \
 		countdown=`expr $$countdown - 1`; \
-	done; \
+    	done; \
 	mv refman.pdf ../@PACKAGE@.pdf
+
 endif DX_COND_pdf
+
 ## ------------------------------------------------- ##
 ## Rules specific for LaTeX (shared for PS and PDF). ##
 ## ------------------------------------------------- ##
+
 if DX_COND_latex
+
 DX_CLEAN_LATEX = @DX_DOCDIR@/latex
+
 endif DX_COND_latex
+
 .PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
 .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
 doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
+
 doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
 @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
 	rm -rf @DX_DOCDIR@
 	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
+
 DX_CLEANFILES = \
-	@DX_DOCDIR@/@PACKAGE@.tag \
-	-r \
-	$(DX_CLEAN_HTML) \
-	$(DX_CLEAN_CHM) \
-	$(DX_CLEAN_CHI) \
-	$(DX_CLEAN_MAN) \
-	$(DX_CLEAN_RTF) \
-	$(DX_CLEAN_XML) \
-	$(DX_CLEAN_PS) \
-	$(DX_CLEAN_PDF) \
-	$(DX_CLEAN_LATEX)
+    @DX_DOCDIR@/@PACKAGE@.tag \
+    -r \
+    $(DX_CLEAN_HTML) \
+    $(DX_CLEAN_CHM) \
+    $(DX_CLEAN_CHI) \
+    $(DX_CLEAN_MAN) \
+    $(DX_CLEAN_RTF) \
+    $(DX_CLEAN_XML) \
+    $(DX_CLEAN_PS) \
+    $(DX_CLEAN_PDF) \
+    $(DX_CLEAN_LATEX)
+
 endif DX_COND_doc