From a2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 20 Apr 2000 23:18:51 +0000 Subject: Use "e-minicard" as the log domain. 2000-04-18 Federico Mena Quintero * 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/widgets/Makefile.am | 77 ++++++++++++++------------- addressbook/gui/widgets/e-minicard-label.c | 8 +-- addressbook/gui/widgets/e-minicard-view.c | 2 +- addressbook/gui/widgets/e-minicard-view.h | 2 +- addressbook/gui/widgets/e-minicard.c | 10 ++-- addressbook/gui/widgets/e-minicard.h | 2 +- addressbook/gui/widgets/test-minicard-label.c | 2 +- addressbook/gui/widgets/test-minicard-view.c | 2 +- addressbook/gui/widgets/test-reflow.c | 2 +- 9 files changed, 56 insertions(+), 51 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 46adb6da2b..44cbed0819 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,15 +1,16 @@ -INCLUDES = \ - -I$(top_srcdir)/addressbook/backend/ebook \ +INCLUDES = \ + -DG_LOG_DOMAIN=\"e-minicard\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/addressbook/contact-editor \ - -I$(top_builddir)/addressbook/backend/ebook \ - -I$(top_srcdir)/widgets/e-text \ - -I$(top_srcdir)/e-util \ + -I$(top_srcdir)/widgets/e-text \ $(GNOME_INCLUDEDIR) noinst_LIBRARIES = \ libeminicard.a -libeminicard_a_SOURCES = \ +libeminicard_a_SOURCES = \ e-minicard.c \ e-minicard.h \ e-minicard-label.c \ @@ -21,61 +22,61 @@ libeminicard_a_SOURCES = \ e-reflow.c \ e-reflow.h -noinst_PROGRAMS = \ - minicard-label-test \ - minicard-test \ - reflow-test \ +noinst_PROGRAMS = \ + minicard-label-test \ + minicard-test \ + reflow-test \ minicard-view-test minicard_label_test_SOURCES = \ test-minicard-label.c -minicard_label_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ +minicard_label_test_LDADD = \ + $(EXTRA_GNOME_LIBS) \ $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ + libeminicard.a \ -lbonobo \ - $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/e-text/libetext.a minicard_test_SOURCES = \ test-minicard.c -minicard_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ - $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/libversit/libversit.la \ +minicard_test_LDADD = \ + $(EXTRA_GNOME_LIBS) \ + $(GNOMEGNORBA_LIBS) \ + libeminicard.a \ + -lbonobo \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ $(top_builddir)/widgets/e-text/libetext.a reflow_test_SOURCES = \ test-reflow.c -reflow_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ - $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/libversit/libversit.la \ +reflow_test_LDADD = \ + $(EXTRA_GNOME_LIBS) \ + $(GNOMEGNORBA_LIBS) \ + libeminicard.a \ + -lbonobo \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ $(top_builddir)/widgets/e-text/libetext.a minicard_view_test_SOURCES = \ test-minicard-view.c -minicard_view_test_LDADD = \ - $(EXTRA_GNOME_LIBS) \ - $(GNOMEGNORBA_LIBS) \ - libeminicard.a \ - -lbonobo \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/libversit/libversit.la \ +minicard_view_test_LDADD = \ + $(EXTRA_GNOME_LIBS) \ + $(GNOMEGNORBA_LIBS) \ + libeminicard.a \ + -lbonobo \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + $(top_builddir)/libversit/libversit.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ $(top_builddir)/widgets/e-text/libetext.a diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 799eb87cd1..e0e5c98118 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -20,12 +20,14 @@ * Boston, MA 02111-1307, USA. */ +#include #include #include "e-minicard-label.h" #include "e-text.h" -#include "e-canvas.h" -#include "e-util.h" -#include "e-canvas-utils.h" +#include +#include +#include + static void e_minicard_label_init (EMinicardLabel *card); static void e_minicard_label_class_init (EMinicardLabelClass *klass); static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 080693b354..35024d9564 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -22,7 +22,7 @@ #include #include -#include "e-canvas.h" +#include #include "e-minicard-view.h" #include "e-minicard.h" static void e_minicard_view_init (EMinicardView *reflow); diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index bb50aa99c1..ab0eeb892d 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -23,7 +23,7 @@ #include #include "e-reflow-sorted.h" -#include "e-book.h" +#include #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 0b6cbd428a..addb019510 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -20,16 +20,18 @@ * Boston, MA 02111-1307, USA. */ +#include #include #include "e-minicard.h" #include "e-minicard-label.h" #include "e-text.h" -#include "e-book.h" -#include "e-canvas.h" -#include "e-util.h" -#include "e-canvas-utils.h" +#include +#include +#include +#include #include "e-contact-editor.h" #include "e-minicard-view.h" + static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *klass); static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 85481d586e..6844e136bd 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -22,7 +22,7 @@ #define __E_MINICARD_H__ #include -#include "e-card.h" +#include #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c index 727d709925..adf092206c 100644 --- a/addressbook/gui/widgets/test-minicard-label.c +++ b/addressbook/gui/widgets/test-minicard-label.c @@ -21,7 +21,7 @@ #include #include "e-minicard-label.h" -#include "e-canvas.h" +#include /* This is a horrible thing to do, but it is just a test. */ GnomeCanvasItem *label; diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c index d3ceff228e..c03d11d07e 100644 --- a/addressbook/gui/widgets/test-minicard-view.c +++ b/addressbook/gui/widgets/test-minicard-view.c @@ -20,7 +20,7 @@ #include #include #include -#include "e-canvas.h" +#include #include "e-minicard-view.h" /* This is a horrible thing to do, but it is just a test. */ diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index f80448b687..4817d13120 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -48,7 +48,7 @@ #include "config.h" #include -#include "e-canvas.h" +#include #include "e-reflow.h" #include "e-minicard.h" -- cgit