aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/contact-editor
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/contact-editor')
-rw-r--r--addressbook/contact-editor/Makefile.am27
-rw-r--r--addressbook/contact-editor/e-contact-editor.c2
-rw-r--r--addressbook/contact-editor/e-contact-editor.h2
3 files changed, 17 insertions, 14 deletions
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index 0e8b924e5e..0a8b3a8489 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/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
-
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 2bb76cebe1..5067b4ff25 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -20,8 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-contact-editor.h"
+
static void e_contact_editor_init (EContactEditor *card);
static void e_contact_editor_class_init (EContactEditorClass *klass);
static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
index 72f87e9b08..82f4a22623 100644
--- a/addressbook/contact-editor/e-contact-editor.h
+++ b/addressbook/contact-editor/e-contact-editor.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include <glade/glade.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {