From 96dfbdbed170533839ea6848d6c03d36bf3f1947 Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Sat, 26 Apr 2003 19:29:52 +0000
Subject: [PATCH] More doxygen generation.

---
 doc/Makefile.am      | 16 +---------------
 doc/html/Makefile.am | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 042ffee..a9c9668 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,19 +3,5 @@
 # $Name$
 
 SUBDIRS = images . doxygen html
-DOC_FILES = index.html usage.html parser.html interface.html links.html \
-	    encoding.html gom.html
-GENERATED_DOC_FILES = gomxref.html utf8tools.html
 DOC_GEN = make_gom_xref
-EXTRA_DIST = $(DOC_FILES) $(DOC_GEN) index.html.in $(GENERATED_DOC_FILES)
-docdir = $(datadir)/doc/@PACKAGE@-@VERSION@
-DISTCLEANFILES = $(GENERATED_DOC_FILES)
-
-doc_DATA = $(DOC_FILES) $(GENERATED_DOC_FILES)
-
-gomxref.html:	$(srcdir)/../include/gom.h make_gom_xref
-	srcdir=$(srcdir); export srcdir; \
-        perl $(srcdir)/make_gom_xref
-
-utf8tools.html:	$(srcdir)/../utf8/doc/utf8tools.html
-	cp $< $@
+EXTRA_DIST = $(DOC_GEN)
diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 8003f2e..6189a78 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -4,16 +4,23 @@
 
 SUBDIRS = images .
 DOC_FILES = encoding.html interface.html
-DOC_FILES_PREFIXED := $(addprefix $(srcdir)/, $(DOC_FILES))
+GENERATED_DOC_FILES = utf8tools.html gomxref.html
+DOC_FILES_PREFIXED := $(addprefix $(srcdir)/, $(DOC_FILES) $(GENERATED_DOC_FILES))
+
 ALL_HTML_FILES := $(wildcard $(srcdir)/*.html)
-GENERATED_DOC_FILES := $(filter-out $(DOC_FILES_PREFIXED), $(ALL_HTML_FILES))
-GENERATED_EXTRA_FILES = doxygen.css $(wildcard $(srcdir)/*.png)
+DOXYGEN_FILES := $(filter-out $(DOC_FILES_PREFIXED), $(ALL_HTML_FILES))
+DOXYGEN_EXTRA_FILES = doxygen.css $(wildcard $(srcdir)/*.png)
 
-EXTRA_DIST = $(ALL_HTML_FILES) $(GENERATED_EXTRA_FILES) utf8tools.html
+EXTRA_DIST = $(ALL_HTML_FILES) $(DOXYGEN_EXTRA_FILES)
 docdir = $(datadir)/doc/@PACKAGE@-@VERSION@
-DISTCLEANFILES = $(GENERATED_DOC_FILES) $(GENERATED_EXTRA_FILES)
+DISTCLEANFILES = $(DOXYGEN_FILES) $(DOXYGEN_EXTRA_FILES) $(GENERATED_DOC_FILES)
+
+doc_DATA = $(DOXYGEN_FILES) $(DOXYGEN_EXTRA_FILES) $(DOC_FILES) \
+           $(GENERATED_DOC_FILES)
 
-# doc_DATA = $(ALL_HTML_FILES) $(GENERATED_EXTRA_FILES)
+gomxref.html:	$(srcdir)/../../include/gom.h $(srcdir)/../make_gom_xref
+	srcdir=$(srcdir); export srcdir; \
+        perl $(srcdir)/../make_gom_xref $(srcdir)/../../include/gom.h
 
 utf8tools.html:	$(srcdir)/../../utf8/doc/utf8tools.html
 	cp $< $@
-- 
2.30.2