aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-04-26 02:48:33 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-04-26 02:48:33 +0800
commit0759a9fa89706b3197ae3771f2098c2393f49386 (patch)
treef100f9ec30ad753693b1eff6c7f35d473c74b792
parent7e3a3892c4b93965198e5518f112679c4ff8bac6 (diff)
downloadgsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.tar
gsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.tar.gz
gsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.tar.bz2
gsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.tar.lz
gsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.tar.xz
gsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.tar.zst
gsoc2013-evolution-0759a9fa89706b3197ae3771f2098c2393f49386.zip
The Joy of Broken Makefiles Part #3.
svn path=/trunk/; revision=2610
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/backend/pas/Makefile.am4
-rw-r--r--addressbook/gui/minicard/Makefile.am2
-rw-r--r--addressbook/gui/widgets/Makefile.am2
4 files changed, 11 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index afb81167b1..d7ff2b927f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
2000-04-25 Ettore Perazzoli <ettore@helixcode.com>
+ * gui/minicard/Makefile.am (INCLUDES): Use
+ `$(BONOBO_GNOME_CFLAGS)'.
+
+ * backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to
+ pick up IDL files in the installation prefix as well.
+ (INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
+
* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'
to get the IDLs from the installation prefix as well.
(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 44cb5a66a1..98b158acfc 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -7,7 +7,7 @@ CORBA_SOURCE = \
idls = \
$(srcdir)/../idl/addressbook.idl
-idl_flags = `$(GNOME_CONFIG) --cflags idl`
+idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
$(CORBA_SOURCE): $(idls)
$(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
@@ -18,7 +18,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
- $(GNOME_INCLUDEDIR)
+ $(BONOBO_GNOME_CFLAGS)
if ENABLE_LDAP
LDAP_BACKEND = pas-backend-ldap.c
diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am
index 44cbed0819..54da3de4d0 100644
--- a/addressbook/gui/minicard/Makefile.am
+++ b/addressbook/gui/minicard/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/contact-editor \
-I$(top_srcdir)/widgets/e-text \
- $(GNOME_INCLUDEDIR)
+ $(BONOBO_GNOME_CFLAGS)
noinst_LIBRARIES = \
libeminicard.a
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 44cbed0819..54da3de4d0 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/contact-editor \
-I$(top_srcdir)/widgets/e-text \
- $(GNOME_INCLUDEDIR)
+ $(BONOBO_GNOME_CFLAGS)
noinst_LIBRARIES = \
libeminicard.a