Remove this section, which doesn't apply to anything since there are no

	* idl/Makefile.am (INCLUDES): Remove this section, which doesn't
	apply to anything since there are no targets in this directory.

	* test-service/Makefile.am:
	* evolution-services/Makefile.am:
	* component/Makefile.am: Remove UNICODE_LIBS/UNICODE_CFLAGS

svn path=/trunk/; revision=9568

5 files changed, 12 insertions, 24 deletions

diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index b44078a962..d5788e2a1e 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-25  Dan Winship  <danw@ximian.com>
+
+	* idl/Makefile.am (INCLUDES): Remove this section, which doesn't
+	apply to anything since there are no targets in this directory.
+
+	* test-service/Makefile.am: 
+	* evolution-services/Makefile.am: 
+	* component/Makefile.am: Remove UNICODE_LIBS/UNICODE_CFLAGS
+
 2001-04-14  Michael Meeks  <michael@ximian.com>
 
 	* idl/Makefile.am: Remove stale build cruftiness.
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 1af1dd7df1..69856b1837 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = \
 	-I$(top_srcdir)/executive-summary/evolution-services    \
 	$(EXTRA_GNOME_CFLAGS)					\
 	$(GNOME_VFS_CFLAGS)					\
-	$(UNICODE_CFLAGS)					\
 	$(GTKHTML_CFLAGS)					\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
@@ -66,8 +65,7 @@ evolution_executive_summary_LDADD = 					\
 	$(BONOBO_VFS_GNOME_LIBS)			\
 	$(EXTRA_GNOME_LIBS)				\
 	-lgal						\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
+	$(GTKHTML_LIBS)
 
 gladedir = $(datadir)/evolution/glade
 glade_DATA = executive-summary-config.glade
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
index 93f822b949..28b9a1c85c 100644
--- a/executive-summary/evolution-services/Makefile.am
+++ b/executive-summary/evolution-services/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = \
 	-I$(top_builddir)/executive-summary		\
 	$(EXTRA_GNOME_CFLAGS)				\
 	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
 	$(GTKHTML_CFLAGS)				\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
@@ -48,8 +47,7 @@ libevolution_services_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(BONOBO_VFS_GNOME_LIBS)			\
 	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
+	$(GTKHTML_LIBS)
 
 BUILT_SOURCES = $(IDL_GENERATED)
 CLEANFILES   += $(BUILT_SOURCES)
diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am
index 0856a0cdf3..29a35f43cf 100644
--- a/executive-summary/idl/Makefile.am
+++ b/executive-summary/idl/Makefile.am
@@ -1,19 +1,3 @@
-INCLUDES = \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
 EXTRA_DIST = $(IDLS)
 
 IDLS =					\
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
index c31e95035a..62aaafdc9d 100644
--- a/executive-summary/test-service/Makefile.am
+++ b/executive-summary/test-service/Makefile.am
@@ -5,8 +5,7 @@ INCLUDES = \
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/executive-summary	\
 	$(EXTRA_GNOME_CFLAGS)		\
-	$(BONOBO_HTML_GNOME_CFLAGS)	\
-	$(UNICODE_CFLAGS)
+	$(BONOBO_HTML_GNOME_CFLAGS)
 
 test_service_SOURCES = 			\
 	main.c