From abfe42213932a77f350228651ea462302bc97987 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 14 Apr 2000 22:42:54 +0000 Subject: Fix compilation with builddir != srcdir (again). svn path=/trunk/; revision=2441 --- addressbook/backend/ebook/Makefile.am | 10 +++++----- addressbook/backend/ebook/e-card-cursor.h | 2 +- addressbook/backend/pas/Makefile.am | 9 +++++---- addressbook/gui/minicard/Makefile.am | 1 + addressbook/gui/widgets/Makefile.am | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) (limited to 'addressbook') 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 #include -#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 \ diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am index 2eeb1ec3bc..46adb6da2b 100644 --- a/addressbook/gui/minicard/Makefile.am +++ b/addressbook/gui/minicard/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend/ebook \ -I$(top_srcdir)/addressbook/contact-editor \ + -I$(top_builddir)/addressbook/backend/ebook \ -I$(top_srcdir)/widgets/e-text \ -I$(top_srcdir)/e-util \ $(GNOME_INCLUDEDIR) diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 2eeb1ec3bc..46adb6da2b 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend/ebook \ -I$(top_srcdir)/addressbook/contact-editor \ + -I$(top_builddir)/addressbook/backend/ebook \ -I$(top_srcdir)/widgets/e-text \ -I$(top_srcdir)/e-util \ $(GNOME_INCLUDEDIR) -- cgit