aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/component/Makefile.am3
-rw-r--r--addressbook/gui/component/select-names/Makefile.am3
-rw-r--r--addressbook/gui/contact-editor/Makefile.am10
-rw-r--r--addressbook/gui/widgets/Makefile.am4
4 files changed, 5 insertions, 15 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 63125a42f2..642c7f91c7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,8 +1,5 @@
SUBDIRS = select-names
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 6116b36b06..ef8d0bf14f 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -20,9 +20,6 @@ oaf_DATA = evolution-addressbook-select-names.oafinfo
#
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index a424cbc55d..1016d38301 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,9 +1,3 @@
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTIONDIR=\""$(evolutiondir)"\"
-
INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
@@ -11,6 +5,10 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
-I$(top_srcdir)/widgets/e-table \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
-DG_LOG_DOMAIN=\"contact-editor\"
noinst_LIBRARIES = \
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index c0c4c7d488..03bd9a4d6e 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,8 +1,6 @@
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"e-minicard\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend/ebook \
-I$(top_srcdir)/addressbook/contact-editor \