Clean up make dist.

2001-07-10  Peter Williams  <peterw@ximian.com>

	* */Makefile.am (dist-hook): Clean up make dist.

svn path=/trunk/; revision=11039

12 files changed, 100 insertions, 76 deletions

diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 67b44d27b3..10a265a9c7 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -31,12 +31,21 @@ evolution-faq: $(FAQ_SGML_FILES)
 	-db2html $(srcdir)/evolution-faq.sgml
 
 dist-hook:
-	mkdir $(distdir)/evolution
-	-cp evolution/*.html evolution/*.css $(distdir)/evolution
 	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
+	mkdir $(distdir)/evolution
 	mkdir $(distdir)/evolution/stylesheet-images
-	-cp evolution/stylesheet-images/* $(distdir)/evolution/stylesheet-images
+	files=`echo $(srcdir)/evolution/*.html` ; \
+	test '$(srcdir)/evolution/*.html' = "$$files" \
+	    || cp $$files $(distdir)/evolution
+	files=`echo $(srcdir)/evolution/*.css` ; \
+	test '$(srcdir)/evolution/*.css' = "$$files" \
+	    || cp $$files $(distdir)/evolution
+	files=`echo $(srcdir)/fig/*.png` ; \
+	test '$(srcdir)/fig/*.png' = "$$files" \
+	    || cp $$files $(distdir)/evolution
+	files=`echo $(srcdir)/evolution/stylesheet-images/*` ; \
+	test '$(srcdir)/evolution/stylesheet-images/*' = "$$files" \
+	    || cp $$files $(distdir)/evolution
 
 # FIXME really messy here
 install-data-local: evolution-guide evolution-faq
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0f466186ee..e038835bb3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-10  Peter Williams  <peterw@ximian.com>
+
+	* */Makefile.am (dist-hook): Clean up make dist.
+
 2001-07-11  Aaron Weber  <aaron@ximian.com>
 
 	* C/evolution.sgml: validation on usage-mainwindow and usage-contact.
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index daf73c2c4f..975c17d009 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -57,11 +57,14 @@ local_entities =					\
 #	importer/sgml/evolution-importer.sgml		\
 #	importer/sgml/evolution-importer-client.sgml
 
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files =				\
+installed_content_files = 		\
 	fdl.sgml			\
 	preface.sgml			\
-	reference.sgml			\
+	reference.sgml
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+content_files =				\
+	$(installed_content_files)	\
 	$(local_entities)
 
 # Other files to distribute.
@@ -87,10 +90,10 @@ HTML_DIR = $(datadir)/gnome/html
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST =			    \
-	$(content_files)		\
-	$(extra_files)		  \
-	$(HTML_IMAGES)		  \
+EXTRA_DIST =				\
+	$(extra_files)		  	\
+	$(installed_content_files)	\
+	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)
 
 #	$(DOC_MODULE).types	     \
@@ -156,8 +159,13 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
-	-cp $(srcdir)/html/index.sgml $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+	test -f $(srcdir)/html/index.sgml && cp $(srcdir)/html/index.sgml $(distdir)/html
+	files=`echo $(srcdir)/html/*.html` ; \
+	test '$(srcdir)/html/*.html' = "$$files" \
+	    || cp $$files $(distdir)/html
+	files=`echo $(srcdir)/html/*.css` ; \
+	test '$(srcdir)/html/*.css' = "$$files" \
+	    || cp $$files $(distdir)/html
 	images=$(HTML_IMAGES) ;	       \
 	for i in $$images ; do		\
 	  cp $(srcdir)/$$i $(distdir)/html ;  \
diff --git a/doc/devel/calendar/Makefile.am b/doc/devel/calendar/Makefile.am
index 207672f303..028622bd82 100644
--- a/doc/devel/calendar/Makefile.am
+++ b/doc/devel/calendar/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cal-client cal-util
+SUBDIRS = cal-util cal-client
 
 EXTRA_DIST =				\
 	alarm-generation.sgml		\
diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am
index b9d707661e..7452ba35b5 100644
--- a/doc/devel/calendar/cal-client/Makefile.am
+++ b/doc/devel/calendar/cal-client/Makefile.am
@@ -45,6 +45,7 @@ extra_files =
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS=						\
 	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/calendar/cal-client		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/libical/src/libical		\
@@ -183,17 +184,12 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	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
-
-# Done automatically by automake in doc/devel
-#	mkdir $(distdir)/sgml
+	mkdir $(distdir)/sgml
+	files=`echo $(srcdir)/tmpl/*.sgml` ; \
+	test '$(srcdir)/tmpl/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/tmpl
+	files=`echo $(srcdir)/sgml/*.sgml` ; \
+	test '$(srcdir)/sgml/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/sgml
 
 .PHONY : dist-hook-local
diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am
index b7c75c5e5a..fa5effcb31 100644
--- a/doc/devel/calendar/cal-util/Makefile.am
+++ b/doc/devel/calendar/cal-util/Makefile.am
@@ -185,17 +185,12 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	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
-
-# Done automatically by automake in doc/devel
-#	mkdir $(distdir)/sgml
+	mkdir $(distdir)/sgml
+	files=`echo $(srcdir)/tmpl/*.sgml` ; \
+	test '$(srcdir)/tmpl/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/tmpl
+	files=`echo $(srcdir)/sgml/*.sgml` ; \
+	test '$(srcdir)/sgml/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/sgml
 
 .PHONY : dist-hook-local
\ No newline at end of file
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 67b44d27b3..10a265a9c7 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -31,12 +31,21 @@ evolution-faq: $(FAQ_SGML_FILES)
 	-db2html $(srcdir)/evolution-faq.sgml
 
 dist-hook:
-	mkdir $(distdir)/evolution
-	-cp evolution/*.html evolution/*.css $(distdir)/evolution
 	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
+	mkdir $(distdir)/evolution
 	mkdir $(distdir)/evolution/stylesheet-images
-	-cp evolution/stylesheet-images/* $(distdir)/evolution/stylesheet-images
+	files=`echo $(srcdir)/evolution/*.html` ; \
+	test '$(srcdir)/evolution/*.html' = "$$files" \
+	    || cp $$files $(distdir)/evolution
+	files=`echo $(srcdir)/evolution/*.css` ; \
+	test '$(srcdir)/evolution/*.css' = "$$files" \
+	    || cp $$files $(distdir)/evolution
+	files=`echo $(srcdir)/fig/*.png` ; \
+	test '$(srcdir)/fig/*.png' = "$$files" \
+	    || cp $$files $(distdir)/evolution
+	files=`echo $(srcdir)/evolution/stylesheet-images/*` ; \
+	test '$(srcdir)/evolution/stylesheet-images/*' = "$$files" \
+	    || cp $$files $(distdir)/evolution
 
 # FIXME really messy here
 install-data-local: evolution-guide evolution-faq
diff --git a/help/ChangeLog b/help/ChangeLog
index 0f466186ee..e038835bb3 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-10  Peter Williams  <peterw@ximian.com>
+
+	* */Makefile.am (dist-hook): Clean up make dist.
+
 2001-07-11  Aaron Weber  <aaron@ximian.com>
 
 	* C/evolution.sgml: validation on usage-mainwindow and usage-contact.
diff --git a/help/devel/Makefile.am b/help/devel/Makefile.am
index daf73c2c4f..975c17d009 100644
--- a/help/devel/Makefile.am
+++ b/help/devel/Makefile.am
@@ -57,11 +57,14 @@ local_entities =					\
 #	importer/sgml/evolution-importer.sgml		\
 #	importer/sgml/evolution-importer-client.sgml
 
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files =				\
+installed_content_files = 		\
 	fdl.sgml			\
 	preface.sgml			\
-	reference.sgml			\
+	reference.sgml
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+content_files =				\
+	$(installed_content_files)	\
 	$(local_entities)
 
 # Other files to distribute.
@@ -87,10 +90,10 @@ HTML_DIR = $(datadir)/gnome/html
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST =			    \
-	$(content_files)		\
-	$(extra_files)		  \
-	$(HTML_IMAGES)		  \
+EXTRA_DIST =				\
+	$(extra_files)		  	\
+	$(installed_content_files)	\
+	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)
 
 #	$(DOC_MODULE).types	     \
@@ -156,8 +159,13 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
-	-cp $(srcdir)/html/index.sgml $(distdir)/html
-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+	test -f $(srcdir)/html/index.sgml && cp $(srcdir)/html/index.sgml $(distdir)/html
+	files=`echo $(srcdir)/html/*.html` ; \
+	test '$(srcdir)/html/*.html' = "$$files" \
+	    || cp $$files $(distdir)/html
+	files=`echo $(srcdir)/html/*.css` ; \
+	test '$(srcdir)/html/*.css' = "$$files" \
+	    || cp $$files $(distdir)/html
 	images=$(HTML_IMAGES) ;	       \
 	for i in $$images ; do		\
 	  cp $(srcdir)/$$i $(distdir)/html ;  \
diff --git a/help/devel/calendar/Makefile.am b/help/devel/calendar/Makefile.am
index 207672f303..028622bd82 100644
--- a/help/devel/calendar/Makefile.am
+++ b/help/devel/calendar/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cal-client cal-util
+SUBDIRS = cal-util cal-client
 
 EXTRA_DIST =				\
 	alarm-generation.sgml		\
diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am
index b9d707661e..7452ba35b5 100644
--- a/help/devel/calendar/cal-client/Makefile.am
+++ b/help/devel/calendar/cal-client/Makefile.am
@@ -45,6 +45,7 @@ extra_files =
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS=						\
 	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/calendar/cal-client		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/libical/src/libical		\
@@ -183,17 +184,12 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	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
-
-# Done automatically by automake in doc/devel
-#	mkdir $(distdir)/sgml
+	mkdir $(distdir)/sgml
+	files=`echo $(srcdir)/tmpl/*.sgml` ; \
+	test '$(srcdir)/tmpl/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/tmpl
+	files=`echo $(srcdir)/sgml/*.sgml` ; \
+	test '$(srcdir)/sgml/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/sgml
 
 .PHONY : dist-hook-local
diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am
index b7c75c5e5a..fa5effcb31 100644
--- a/help/devel/calendar/cal-util/Makefile.am
+++ b/help/devel/calendar/cal-util/Makefile.am
@@ -185,17 +185,12 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	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
-
-# Done automatically by automake in doc/devel
-#	mkdir $(distdir)/sgml
+	mkdir $(distdir)/sgml
+	files=`echo $(srcdir)/tmpl/*.sgml` ; \
+	test '$(srcdir)/tmpl/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/tmpl
+	files=`echo $(srcdir)/sgml/*.sgml` ; \
+	test '$(srcdir)/sgml/*.sgml' = "$$files" \
+	    || cp $$files $(distdir)/sgml
 
 .PHONY : dist-hook-local
\ No newline at end of file