Remove $(srcdir)/html before building HTML to prevent stale files. DistGLIB_1_3_10

Fri Oct 26 11:42:50 2001  Owen Taylor  <otaylor@redhat.com>

	* */Makefile.am: Remove $(srcdir)/html before building
	HTML to prevent stale files. Dist all files in html/

11 files changed, 63 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ff8b07cee..0d6f0fee4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 1.3.10, interface age, binary age = 0.
+
+	* NEWS: Updates
+
 2001-10-26  Tor Lillqvist  <tml@iki.fi>
 
 	* configure.in: Don't default to win32 thread implementation on
@@ -16,12 +22,6 @@
 
 	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
-Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
-
-	* configure.in: Version 1.3.10, interface age, binary age = 0.
-
-	* NEWS: Updates
-
 Thu Oct 25 12:01:41 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* tests/Makefile.am: Temporarily remove mainloop-test, since it
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 3bcc1c3ce..f47f509f0 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 26 11:42:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* */Makefile.am: Remove $(srcdir)/html before building
+	HTML to prevent stale files. Dist all files in html/
+
 2001-10-25  Havoc Pennington  <hp@pobox.com>
 
 	* glib/tmpl/string_utils.sgml: docs on why the deprecated
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 904cdd628..690b11da0 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -138,7 +138,8 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo '*** Building HTML ***'
-	test -d $(srcdir)/html || mkdir $(srcdir)/html
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo '-- Fixing Crossreferences' 
@@ -156,8 +157,8 @@ maintainer-clean-local: clean
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
 	  for i in $$installfiles; do \
@@ -185,12 +186,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	cp $(srcdir)/html/index.sgml $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-	images=$(HTML_IMAGES) ;    	      \
-	for i in $$images ; do		      \
-	  cp $(srcdir)/$$i $(distdir)/html ;  \
-	done
+	-cp $(srcdir)/html/* $(distdir)/html
 
 .PHONY : dist-hook-local
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index b03d657f8..2462df3a3 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -124,7 +124,8 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo '*** Building HTML ***'
-	test -d $(srcdir)/html || mkdir $(srcdir)/html
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo '-- Fixing Crossreferences' 
@@ -142,8 +143,8 @@ maintainer-clean-local: clean
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
 	  for i in $$installfiles; do \
@@ -171,12 +172,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/html/index.sgml $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-	images=$(HTML_IMAGES) ;    	      \
-	for i in $$images ; do		      \
-	  cp $(srcdir)/$$i $(distdir)/html ;  \
-	done
+	-cp $(srcdir)/html/* $(distdir)/html
 
 .PHONY : dist-hook-local