Fix compilation with builddir != srcdir (again).

svn path=/trunk/; revision=2441

11 files changed, 46 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b825360364..a4bfa0e832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* addressbook/backend/ebook/e-card-cursor.h: #include
+	"addressbook/backend/ebook" to make sure we pick up the right
+	addressbook.h.  Butt ugly, but at least it makes it possible for
+	me to build Evolution.
+
+	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
+	`$(builddir)' so that we pick up the IDL-generated includes
+	correctly.
+	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
+	`$(srcdir)'.
+
+	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
+	it works with builddir != srcdir.
+	* addressbook/backend/pas/Makefile.am: Likewise.
+
 2000-04-14  Chris Toshok  <toshok@helixcode.com>
 
 	* addressbook/backend/pas/pas-backend-ldap.c
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				\
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)
diff --git a/po/ChangeLog b/po/ChangeLog
index 86d3d0f15c..f7a0ea9a4b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* POTFILES.in: Removed `libversit/vcc.c' as its auto-generated and
+	breaks.
+
 2000-04-12  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* da.po: Updated Danish file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eb70997552..2c5e961cac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ composer/e-msg-composer-attachment.c
 composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
 e-util/e-setup.c
-libversit/vcc.c
 libversit/vobject.c
 mail/folder-browser-factory.c
 mail/folder-browser.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc60f59388..7f4e7044e8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -55,3 +55,5 @@ noinst_PROGRAMS =  	\
 	test11		\
 	test-movemail	\
 	$(THREAD_RELATED_TESTS)
+
+#	test-formatter	
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 4316698089..a93b270091 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* Makefile.am (INCLUDES): Added
+	`-I$(top_builddir)/addressbook/backend/pas', and
+	`-I$(top_builddir)/calendar/pcs' because that's where the
+	IDL-generated files go.
+
 2000-04-14  Chris Toshok  <toshok@helixcode.com>
 
 	* Makefile.am (wombat_LDADD): use BONOBO_VFS_GNOME_LIBS instead of
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index db6bc21d3f..2282981673 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -4,7 +4,9 @@ INCLUDES =						\
 	-I$(top_srcdir)/e-util				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/backend/pas		\
+	-I$(top_builddir)/addressbook/backend/pas	\
 	-I$(top_srcdir)/calendar/pcs			\
+	-I$(top_builddir)/calendar/pcs			\
 	-I$(top_srcdir)/calendar/cal-util		\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"