diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-05-13 21:02:08 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-05-13 21:02:08 +0800 |
| commit | 196a6688a65eb82e2c982c5c92e91a299fa9da84 (patch) | |
| tree | 7ac6f92670628e3d63f51f1da263247379d48d51 /wombat | |
| parent | 74634bdee6e775eaadd4d36ce4fff8a7d2af4326 (diff) | |
| download | gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.tar gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.tar.gz gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.tar.bz2 gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.tar.lz gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.tar.xz gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.tar.zst gsoc2013-evolution-196a6688a65eb82e2c982c5c92e91a299fa9da84.zip | |
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
Diffstat (limited to 'wombat')
| -rw-r--r-- | wombat/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <ettore@helixcode.com> + + * 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 <clahey@helixcode.com> * 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"\" |