Fix make dist.

2001-06-25  Peter Williams  <peterw@ximian.com>

	* calendar/cal-util/Makefile.am,
	calendar/cal-client/Makefile.am: Fix make dist.

	* Makefile.am: clean up a bit.

svn path=/trunk/; revision=10481

8 files changed, 26 insertions, 12 deletions

diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
index 4634ba2153..c95cdd0d83 100644
--- a/doc/devel/ChangeLog
+++ b/doc/devel/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-25  Peter Williams  <peterw@ximian.com>
+
+	* calendar/cal-util/Makefile.am,
+	calendar/cal-client/Makefile.am: Fix make dist.
+
+	* Makefile.am: clean up a bit.
+
 2001-06-21  JP Rosevear  <jpr@ximian.com>
 
 	* Makefile.am: disable executive summary build because it is no
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index 3a24f9a31b..f38984555b 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -59,7 +59,6 @@ local_entities =					\
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files =				\
-	evolution-devel-guide.sgml	\
 	fdl.sgml			\
 	preface.sgml			\
 	reference.sgml			\
@@ -159,7 +158,6 @@ 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
-
 	images=$(HTML_IMAGES) ;	       \
 	for i in $$images ; do		\
 	  cp $(srcdir)/$$i $(distdir)/html ;  \
diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am
index bd01ad3b03..b9d707661e 100644
--- a/doc/devel/calendar/cal-client/Makefile.am
+++ b/doc/devel/calendar/cal-client/Makefile.am
@@ -183,16 +183,17 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/sgml
 	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
+
 .PHONY : dist-hook-local
diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am
index fd697713ce..b7c75c5e5a 100644
--- a/doc/devel/calendar/cal-util/Makefile.am
+++ b/doc/devel/calendar/cal-util/Makefile.am
@@ -185,16 +185,17 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/sgml
 	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
+
 .PHONY : dist-hook-local
\ No newline at end of file
diff --git a/help/devel/ChangeLog b/help/devel/ChangeLog
index 4634ba2153..c95cdd0d83 100644
--- a/help/devel/ChangeLog
+++ b/help/devel/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-25  Peter Williams  <peterw@ximian.com>
+
+	* calendar/cal-util/Makefile.am,
+	calendar/cal-client/Makefile.am: Fix make dist.
+
+	* Makefile.am: clean up a bit.
+
 2001-06-21  JP Rosevear  <jpr@ximian.com>
 
 	* Makefile.am: disable executive summary build because it is no
diff --git a/help/devel/Makefile.am b/help/devel/Makefile.am
index 3a24f9a31b..f38984555b 100644
--- a/help/devel/Makefile.am
+++ b/help/devel/Makefile.am
@@ -59,7 +59,6 @@ local_entities =					\
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files =				\
-	evolution-devel-guide.sgml	\
 	fdl.sgml			\
 	preface.sgml			\
 	reference.sgml			\
@@ -159,7 +158,6 @@ 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
-
 	images=$(HTML_IMAGES) ;	       \
 	for i in $$images ; do		\
 	  cp $(srcdir)/$$i $(distdir)/html ;  \
diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am
index bd01ad3b03..b9d707661e 100644
--- a/help/devel/calendar/cal-client/Makefile.am
+++ b/help/devel/calendar/cal-client/Makefile.am
@@ -183,16 +183,17 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/sgml
 	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
+
 .PHONY : dist-hook-local
diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am
index fd697713ce..b7c75c5e5a 100644
--- a/help/devel/calendar/cal-util/Makefile.am
+++ b/help/devel/calendar/cal-util/Makefile.am
@@ -185,16 +185,17 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/sgml
 	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
+
 .PHONY : dist-hook-local
\ No newline at end of file