From 1a983f0dd7a01d23c2d06f870f7208525e0e0f63 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 14 Mar 2001 11:42:37 +0000 Subject: builddir != srcdir fixes. Yay! svn path=/trunk/; revision=8706 --- mail/ChangeLog | 5 +++++ mail/importers/Makefile.am | 2 ++ shell/ChangeLog | 6 ++++++ shell/importer/Makefile.am | 11 +++++++---- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 85b41df89c..1b0cbd25ff 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-03-14 Ettore Perazzoli + + * importers/Makefile.am (INCLUDES): Add `-I$(top_builddir)/shell' + and `-I$(top_srcdir)'. + 2001-03-13 Dan Winship * mail-display.c (on_url_requested): Call gtk_html_end() on the diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index aaefed7672..90e25153e7 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -4,7 +4,9 @@ importers_LTLIBRARIES = liboutlook.la libmbox.la libiinetscape.la INCLUDES = -I.. \ -I$(srcdir)/.. \ + -I$(top_srcdir) \ -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ -I$(includedir) \ $(GNOME_INCLUDEDIR) \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" diff --git a/shell/ChangeLog b/shell/ChangeLog index 1640522206..ec45ae5c65 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2001-03-14 Ettore Perazzoli + + * importer/Makefile.am (INCLUDES): Remove `-g Wall' and friends. + Use `$(EXTRA_GNOME_CFLAGS)' instead of `$(GNOME_INCLUDEDIR)'. Add + `-I$(top_builddir)/shell'. + 2001-03-13 Iain Holmes * importer/intelligent.c (start_importer): Add a "Don't ask me again" diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index 975d5a372a..7d05b190c8 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -1,7 +1,10 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shell \ - -I$(includedir) $(GNOME_INCLUDEDIR) \ - -DG_LOG_DOMAIN=\"Evolution-Importer\" -g -Wall \ - -Wmissing-prototypes -Wmissing-declarations \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -I$(includedir) \ + $(EXTRA_GNOME_CFLAGS) \ + -DG_LOG_DOMAIN=\"Evolution-Importer\" \ -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" lib_LTLIBRARIES = libevolution-importer.la -- cgit v1.2.3