[evolution-patches] fixes for automake 1.7.3

[Larry Ewing <lewing ximian com>]

This patch lets me actually pass distcheck on my box again.

--Larry


? autom4te.cache
? gtkhtml-3.0.2.tar.gz
? stamp-h1
? components/html-editor/test_editor
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/ChangeLog,v
retrieving revision 1.231
diff -u -p -r1.231 ChangeLog
--- ChangeLog	9 Apr 2003 11:08:40 -0000	1.231
+++ ChangeLog	29 Apr 2003 18:07:35 -0000
@@ -1,3 +1,9 @@
+2003-04-29  Larry Ewing  <lewing ximian com>
+
+	* Makefile.am (CLEANFILES): add new CLEANFILES to pass distcheck
+	with automake-1.7.3, this is probably something that should be
+	fixed in intltool.
+
 2003-04-09  Radek Doulik  <rodo ximian com>
 
 	* configure.in: use gal for library as well (we use
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- Makefile.am	1 Nov 2002 15:06:10 -0000	1.27
+++ Makefile.am	29 Apr 2003 18:07:35 -0000
@@ -5,6 +5,12 @@ SUBDIRS =					\
 	art					\
 	po
 
+CLEANFILES =					\
+	po/.intltool-merge-cache		\
+	intltool-extract			\
+	intltool-update				\
+	intltool-merge
+
 EXTRA_DIST =					\
 	gtkhtml.spec.in				\
 	gtkhtml.spec                            \
Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.397
diff -u -p -r1.397 ChangeLog
--- components/html-editor/ChangeLog	17 Apr 2003 17:34:59 -0000	1.397
+++ components/html-editor/ChangeLog	29 Apr 2003 18:07:38 -0000
@@ -1,3 +1,10 @@
+2003-04-29  Larry Ewing  <lewing ximian com>
+
+	* Makefile.am (CLEANFILES): add missing files to CLEANFILES to
+	make automake-1.7.3 happy.
+
+	* menubar.c: remove unused include.
+
 2003-04-17  Radek Doulik  <rodo ximian com>
 
 	* html-stream-mem.c: derive from BonoboObject instead of
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile.am
--- components/html-editor/Makefile.am	17 Apr 2003 14:53:45 -0000	1.84
+++ components/html-editor/Makefile.am	29 Apr 2003 18:07:38 -0000
@@ -148,7 +148,7 @@ noinst_LTLIBRARIES = libgnome-gtkhtml-ed
 privlibdir = "$(libdir)/gtkhtml"
 privlib_LTLIBRARIES = $(MY_LIBS)
 
-noinst_PROGRAMS = 		\
+noinst_PROGRAMS = 		
 	test_editor
 
 libexec_PROGRAMS = $(MY_PRGS)
@@ -161,7 +161,6 @@ $(server_in_files:.server.in.in=.server.
 	sed -e "s|\ GNOME_GTKHTML_EDITOR_LOCATION\@|$(location)|g" \
 	-e "s|\ EDITOR_API_VERSION\@|$(EDITOR_API_VERSION)|g" \
 	-e "s|\ GNOME_GTKHTML_EDITOR_TYPE\@|$(GNOME_GTKHTML_EDITOR_TYPE)|g" $< > $@
-
 @INTLTOOL_SERVER_RULE@
 
 GNOME_GtkHTML_Editor.xml: GNOME_GtkHTML_Editor.xml.in Makefile
@@ -191,11 +190,15 @@ EXTRA_DIST =					\
 	GNOME_GtkHTML_Editor.xml.in		\
 	gtkhtml-editor-properties.glade		\
 	$(server_in_files) $(server_DATA)
-
 idldir = $(gtkhtml_data)
 idl_DATA = $(IDLS)
 
-CLEANFILES = $(IDL_GENERATED) $(SPELL_IDL_GENERATED) 
+CLEANFILES = \
+	GNOME_GtkHTML_Editor.server		\
+	GNOME_GtkHTML_Editor.server.in		\
+	GNOME_GtkHTML_Editor.xml		\
+	$(IDL_GENERATED)			\
+	$(SPELL_IDL_GENERATED) 
 
 BUILT_SOURCE = $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
 
Index: components/html-editor/menubar.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/menubar.c,v
retrieving revision 1.84
diff -u -p -r1.84 menubar.c
--- components/html-editor/menubar.c	1 Apr 2003 06:16:53 -0000	1.84
+++ components/html-editor/menubar.c	29 Apr 2003 18:07:38 -0000
@@ -33,7 +33,6 @@
 
 #include "htmlengine-edit-cut-and-paste.h"
 
-#include "e-html-utils.h"
 #include "menubar.h"
 #include "gtkhtml.h"
 #include "body.h"