aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/contact-editor/Makefile.am6
-rw-r--r--addressbook/gui/contact-list-editor/Makefile.am10
-rw-r--r--addressbook/gui/merging/Makefile.am5
-rw-r--r--addressbook/gui/widgets/Makefile.am9
-rw-r--r--addressbook/importers/Makefile.am6
-rw-r--r--addressbook/printing/Makefile.am15
-rw-r--r--addressbook/tools/Makefile.am4
-rw-r--r--addressbook/util/Makefile.am6
8 files changed, 33 insertions, 28 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index eb457da7fa..254af85207 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -11,8 +11,8 @@ libecontacteditor_la_CPPFLAGS = \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DG_LOG_DOMAIN=\"contact-editor\" \
- $(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS)
libecontacteditor_la_SOURCES = \
eab-editor.c \
@@ -34,7 +34,7 @@ libecontacteditor_la_LIBADD = \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
$(top_builddir)/addressbook/printing/libecontactprint.la \
$(top_builddir)/widgets/menus/libmenus.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
ui_DATA = \
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 657bbf1da9..bcd398955d 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -10,9 +10,8 @@ libecontactlisteditor_la_CPPFLAGS = \
-I$(top_builddir)/shell \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DG_LOG_DOMAIN=\"contact-list-editor\" \
- $(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
- $(CAMEL_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS)
libecontactlisteditor_la_SOURCES = \
e-contact-list-editor.c \
@@ -29,9 +28,8 @@ libecontactlisteditor_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
- $(CAMEL_LIBS)
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
ui_DATA = contact-list-editor.ui
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 01af6b2534..b1c2b45cf4 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -7,8 +7,9 @@ libeabbookmerging_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/addressbook \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
- $(GNOME_PLATFORM_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS) \
+ $(GTKHTML_CFLAGS)
libeabbookmerging_la_SOURCES = \
eab-contact-compare.c \
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 40c57650bb..546a218ff2 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -18,9 +18,10 @@ libeabwidgets_la_CPPFLAGS = \
-I$(top_srcdir)/addressbook/util \
-I$(top_srcdir)/widgets/misc \
-I$(top_builddir)/shell \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
- $(CHAMPLAIN_CFLAGS)
+ $(CHAMPLAIN_CFLAGS) \
+ $(GTKHTML_CFLAGS)
eabincludedir = $(privincludedir)/addressbook/gui/widgets
@@ -71,8 +72,10 @@ libeabwidgets_la_LIBADD = \
$(top_builddir)/widgets/menus/libmenus.la \
$(top_builddir)/a11y/libevolution-a11y.la \
$(top_builddir)/e-util/libeutil.la \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
- $(CHAMPLAIN_LIBS)
+ $(CHAMPLAIN_LIBS) \
+ $(GTKHTML_LIBS)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 742f46a334..ea29cdc38b 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -9,7 +9,8 @@ libevolution_addressbook_importers_la_CPPFLAGS = \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir)/widgets \
-I$(top_builddir)/addressbook \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GTKHTML_CFLAGS)
libevolution_addressbook_importers_la_SOURCES = \
evolution-ldif-importer.c \
@@ -23,6 +24,7 @@ libevolution_addressbook_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/addressbook/util/libeabutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
- $(IMPORTERS_LIBS)
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GTKHTML_LIBS)
-include $(top_srcdir)/git.mk
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index c315b49d0a..edf3cc9795 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -11,8 +11,8 @@ libecontactprint_la_CPPFLAGS = \
-I$(top_srcdir) \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
- $(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS)
noinst_LTLIBRARIES = libecontactprint.la
@@ -22,8 +22,9 @@ libecontactprint_la_SOURCES = \
e-contact-print.h
libecontactprint_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
noinst_PROGRAMS = contact-print-test
@@ -34,17 +35,17 @@ contact_print_test_CPPFLAGS = \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir) \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
- $(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS)
contact_print_test_SOURCES = test-print.c
contact_print_test_LDADD = \
libecontactprint.la \
$(top_builddir)/addressbook/util/libeabutil.la \
- $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(top_builddir)/e-util/libeutil.la \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
EXTRA_DIST = \
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index 35d742ef3d..26ead07ac5 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -16,7 +16,7 @@ evolution_addressbook_export_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \
-I$(top_srcdir)/addressbook \
-I$(top_builddir)/addressbook \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS)
evolution_addressbook_export_SOURCES = \
evolution-addressbook-export.c \
@@ -25,7 +25,7 @@ evolution_addressbook_export_SOURCES = \
evolution-addressbook-export.h
evolution_addressbook_export_LDADD = \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(EVOLUTION_DATA_SERVER_LIBS)
if OS_WIN32
evolution_addressbook_export_LDFLAGS = -mwindows
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index fe45b3d7e2..ea70fbb9ca 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -11,8 +11,8 @@ libeabutil_la_CPPFLAGS = \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/widgets \
- $(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS)
libeabutil_la_SOURCES = \
eab-book-util.c \
@@ -24,7 +24,7 @@ libeabutil_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
dist-hook:
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 11:00:35 +0800