From 196a6688a65eb82e2c982c5c92e91a299fa9da84 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 13 May 2000 13:02:08 +0000 Subject: Fix Makefile so that it looks for include files in the Evolution source first, and then in the GNOME include directory. svn path=/trunk/; revision=3011 --- wombat/ChangeLog | 6 ++++++ wombat/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wombat/ChangeLog b/wombat/ChangeLog index 7315c777d7..c202e18e2c 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,9 @@ +2000-05-13 Ettore Perazzoli + + * Makefile.am (INCLUDES): GNOME includes should come last, so that + we are sure we pick our own includes instead of the installed + ones, if any. + 2000-05-10 Christopher James Lahey * Makefile.am: Added an include for the pcs directory. diff --git a/wombat/Makefile.am b/wombat/Makefile.am index e6d7cf169f..f5715e7aea 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -1,6 +1,4 @@ INCLUDES = \ - $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ -DG_LOG_DOMAIN=\"wombat\" \ -I$(top_srcdir)/e-util \ -I$(top_srcdir) \ @@ -8,6 +6,8 @@ INCLUDES = \ -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/calendar \ -I$(top_srcdir)/calendar/pcs \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -- cgit