aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-04-15 06:42:54 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-04-15 06:42:54 +0800
commitabfe42213932a77f350228651ea462302bc97987 (patch)
tree3c349be962fcf16922ac760e58032e6f8ef79cb8 /addressbook/backend
parent72ae61158dd7039c8f076e29d59d67101e1a4f6f (diff)
downloadgsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.tar
gsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.tar.gz
gsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.tar.bz2
gsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.tar.lz
gsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.tar.xz
gsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.tar.zst
gsoc2013-evolution-abfe42213932a77f350228651ea462302bc97987.zip
Fix compilation with builddir != srcdir (again).
svn path=/trunk/; revision=2441
Diffstat (limited to 'addressbook/backend')
-rw-r--r--addressbook/backend/ebook/Makefile.am10
-rw-r--r--addressbook/backend/ebook/e-card-cursor.h2
-rw-r--r--addressbook/backend/pas/Makefile.am9
3 files changed, 11 insertions, 10 deletions
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 217c4dfafd..bbff2d7f42 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -9,20 +9,20 @@ CORBA_SOURCE = \
addressbook-skels.c
idls = \
- ../idl/addressbook.idl
+ $(srcdir)/../idl/addressbook.idl
idl_flags = `$(GNOME_CONFIG) --cflags idl`
$(CORBA_SOURCE): $(idls)
- $(ORBIT_IDL) ../idl/addressbook.idl $(idl_flags)
+ $(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"EBook\" \
+ -I$(builddir) \
-I$(srcdir) -I$(top_srcdir) \
- -I. \
- -I.. \
- -I$(top_builddir) \
+ -I$(srcdir)/. \
+ -I$(srcdir)/.. \
-I$(includedir) \
$(GNOME_INCLUDEDIR)
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index 664abfa268..7cb3a1d28c 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -12,7 +12,7 @@
#include <libgnome/gnome-defs.h>
#include <gtk/gtk.h>
-#include "addressbook.h"
+#include "addressbook/backend/ebook/addressbook.h"
#include "e-card.h"
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index dfaf7aae54..c5f8ed302a 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -9,19 +9,20 @@ CORBA_SOURCE = \
addressbook-skels.c
idls = \
- ../idl/addressbook.idl
+ $(srcdir)/../idl/addressbook.idl
idl_flags = `$(GNOME_CONFIG) --cflags idl`
$(CORBA_SOURCE): $(idls)
- $(ORBIT_IDL) ../idl/addressbook.idl $(idl_flags)
+ $(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"Wombat\" \
+ -I$(builddir) \
-I$(srcdir) -I$(top_srcdir) \
- -I. \
- -I.. \
+ -I$(srcdir)/. \
+ -I$(srcdir)/.. \
-I$(top_builddir) \
-I$(includedir) \
-I$(top_srcdir)/e-util \