From a2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@helixcode.com>
Date: Thu, 20 Apr 2000 23:18:51 +0000
Subject: Use "e-minicard" as the log domain.

2000-04-18  Federico Mena Quintero  <federico@helixcode.com>

	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
	domain.

	* gui/component/Makefile.am (INCLUDES): Use
	"evolution-addressbook" as the log domain.

	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
	Do not install any header files.
	(INCLUDES): Remove spurious include paths.

	* backend/pas/*.[ch]: Fix includes.

	* backend/ebook/Makefile.am: Do not install the test programs.
	Fixed some include weirdness.

	* backend/ebook/*.[ch]: Fix includes.

	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
	"contact-editor".
	(INCLUDES): Fix.

	* contact-editor/*.[ch]: Fix includes.

	* gui/minicard/*.[ch]: Fix includes.

svn path=/trunk/; revision=2529
---
 wombat/Makefile.am | 6 +++---
 wombat/wombat.c    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'wombat')

diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index f4bbf1a87c..0c690991f6 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -4,8 +4,8 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"wombat\"			\
 	-I$(top_srcdir)/e-util				\
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/pas		\
-	-I$(top_builddir)/addressbook/backend/pas	\
+	-I$(top_srcdir)/addressbook/backend		\
+	-I$(top_builddir)/addressbook/backend		\
 	-I$(top_srcdir)/calendar			\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
@@ -19,7 +19,7 @@ wombat_SOURCES = 	\
 wombat_LDADD =							\
 	$(EXTRA_GNOME_LIBS)					\
 	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(top_builddir)/addressbook/backend/pas/libpas.la	\
+	$(top_builddir)/addressbook/backend/pas/libpas.a	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
 	$(top_builddir)/calendar/pcs/libpcs.a			\
 	$(top_builddir)/libical/src/libical/libical.la		\
diff --git a/wombat/wombat.c b/wombat/wombat.c
index a1bad2e858..a505eb0a33 100644
--- a/wombat/wombat.c
+++ b/wombat/wombat.c
@@ -7,10 +7,10 @@
 
 #include <config.h>
 #include <bonobo.h>
-#include <pas-book-factory.h>
-#include <pas-backend-file.h>
+#include <pas/pas-book-factory.h>
+#include <pas/pas-backend-file.h>
 #ifdef HAVE_LDAP
-#include <pas-backend-ldap.h>
+#include <pas/pas-backend-ldap.h>
 #endif
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnorba/gnorba.h>
-- 
cgit