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
---
 addressbook/gui/contact-editor/Makefile.am | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'addressbook/gui/contact-editor/Makefile.am')

diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 0e8b924e5e..0a8b3a8489 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,18 +1,20 @@
 imagesdir = $(datadir)/images/evolution
-
 images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png
 
 EXTRA_DIST = $(images)
 pkgdata_DATA = $(images)
 
-CPPFLAGS = \
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"           \
+CPPFLAGS =					\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DDATADIR=\""$(datadir)"\"
 
 INCLUDES =					\
 	$(GNOME_INCLUDEDIR)			\
-	-I$(top_srcdir)/addressbook/backend/ebook \
-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/addressbook/		\
+	-I$(top_srcdir)/addressbook/backend	\
+	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"	\
+	-DG_LOG_DOMAIN=\"contact-editor\"
 
 noinst_LIBRARIES =				\
 	libecontacteditor.a
@@ -21,23 +23,22 @@ libecontacteditor_a_SOURCES = 			\
 	e-contact-editor.c			\
 	e-contact-editor.h
 
-noinst_PROGRAMS =	\
+noinst_PROGRAMS =		\
 	contact-editor-test
 
 contact_editor_test_SOURCES = 	\
 	test-editor.c
 
-contact_editor_test_LDADD =	\
+contact_editor_test_LDADD =					\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
-	$(GNOMEGNORBA_LIBS)				\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	libecontacteditor.a	\
+	$(top_builddir)/libversit/libversit.la			\
+	$(GNOMEGNORBA_LIBS)					\
+	-lbonobo						\
+	$(top_builddir)/e-util/libeutil.la			\
+	libecontacteditor.a					\
 	$(EXTRA_GNOME_LIBS)
 
 gladedir   = $(datadir)/evolution/glade
 
 glade_DATA = 				\
 	contact-editor.glade
-
-- 
cgit v1.2.3