many fixes to make it compile with strange prefixes...

neither mail nor the calendar components work though...
evil stuff.

svn path=/trunk/; revision=4892

7 files changed, 11 insertions, 7 deletions

diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index ac169fe936..44209b15f9 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -12,7 +12,7 @@ IDL_GENERATED = \
 Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
 
 $(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl	\
+	$(ORBIT_IDL) -I$(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
 		-I$(srcdir) $(srcdir)/Evolution-Addressbook-SelectNames.idl
 
 oafdir = $(datadir)/oaf
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 92de21b0ae..bb0f18b036 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -12,7 +12,7 @@ IDL_GENERATED = \
 Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
 
 $(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl	\
+	$(ORBIT_IDL) -I$(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
 		$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
 
 ##
@@ -40,6 +40,8 @@ INCLUDES =								\
 	-I$(top_builddir)/addressbook/gui/component/select-names	\
 	$(GNOME_INCLUDEDIR)						\
 	$(BONOBO_GNOME_CFLAGS)						\
+	$(GTKHTML_CFLAGS)						\
+	$(UNICODE_CFLAGS)						\
 	-DG_LOG_DOMAIN=\"composer\"
 
 CPPFLAGS =					\
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 017f9d48c3..6a1dd2cb02 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -3,6 +3,7 @@ imagesdir = $(datadir)/images/evolution
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	$(GNOME_INCLUDEDIR)			\
+	$(UNICODE_CFLAGS)			\
 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"	\
 	-DG_LOG_DOMAIN=\"e-utils\"		\
 	$(UNICODE_CFLAGS)
diff --git a/filter/Makefile.am b/filter/Makefile.am
index a581462665..65927b827a 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -12,6 +12,8 @@ INCLUDES = 					\
 	-I $(top_builddir)/shell		\
 	-I $(GNOME_INCLUDEDIR)			\
 	$(GTKHTML_CFLAGS)			\
+	$(UNICODE_CFLAGS)			\
+	$(BONOBO_GNOME_CFLAGS)			\
 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
 	-DG_LOG_DOMAIN=\"filter\"
 ##
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 6d1063f96d..cf13d00c54 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -14,7 +14,6 @@ INCLUDES = \
 	$(BONOBO_HTML_GNOME_CFLAGS)			\
 	$(GNOME_VFS_CFLAGS)				\
 	$(UNICODE_CFLAGS)				\
-	$(GCONF_CFLAGS)					\
 	$(GTKHTML_CFLAGS)				\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 97587a0fb8..0b2457a464 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -113,8 +113,8 @@ evolution_LDADD =						\
 	$(top_builddir)/widgets/e-text/libetext.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(BONOBO_GNOME_LIBS)					\
-	$(UNICODE_LIBS)
+	$(UNICODE_LIBS)						\
+	$(BONOBO_GNOME_LIBS)
 
 # Purify support
 
diff --git a/widgets/e-text/Makefile.am b/widgets/e-text/Makefile.am
index d1ec6f61f3..b56d735990 100644
--- a/widgets/e-text/Makefile.am
+++ b/widgets/e-text/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"e-text\"		\
-	$(UNICODE_CFLAGS)
+	$(UNICODE_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"e-text\"
 
 noinst_LIBRARIES =				\
 	libetext.a