aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/Makefile.am7
-rw-r--r--modules/calendar/Makefile.am9
-rw-r--r--modules/mail/Makefile.am7
-rw-r--r--modules/plugin-lib/Makefile.am7
-rw-r--r--modules/plugin-mono/Makefile.am7
-rw-r--r--modules/plugin-python/Makefile.am7
-rw-r--r--modules/plugin-python/example/Makefile.am9
7 files changed, 30 insertions, 23 deletions
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 97e8cdc25d..f014da7ba7 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -2,7 +2,10 @@ if OS_WIN32
WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
endif
-AM_CPPFLAGS = \
+module_LTLIBRARIES = libevolution-module-addressbook.la
+
+libevolution_module_addressbook_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
@@ -23,8 +26,6 @@ AM_CPPFLAGS = \
$(LDAP_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-module_LTLIBRARIES = libevolution-module-addressbook.la
-
libevolution_module_addressbook_la_SOURCES = \
evolution-module-addressbook.c \
addressbook-config.c \
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 47d3f8a6b0..fee7c6826d 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -1,4 +1,8 @@
-AM_CPPFLAGS = \
+module_LTLIBRARIES = \
+ libevolution-module-calendar.la
+
+libevolution_module_calendar_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"calendar-modules\" \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
@@ -6,9 +10,6 @@ AM_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_CALENDAR_CFLAGS)
-module_LTLIBRARIES = \
- libevolution-module-calendar.la
-
libevolution_module_calendar_la_SOURCES = \
evolution-module-calendar.c \
e-cal-attachment-handler.c \
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index bd968d5347..962fc61d06 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS = \
+module_LTLIBRARIES = libevolution-module-mail.la
+
+libevolution_module_mail_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/mail \
-I$(top_srcdir)/widgets \
@@ -9,8 +12,6 @@ AM_CPPFLAGS = \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DG_LOG_DOMAIN=\"evolution-module-mail\"
-module_LTLIBRARIES = libevolution-module-mail.la
-
libevolution_module_mail_la_SOURCES = \
evolution-module-mail.c \
e-mail-attachment-handler.c \
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index cce60902fa..73c4c8f673 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -1,10 +1,11 @@
-AM_CPPFLAGS = \
+module_LTLIBRARIES = libevolution-module-plugin-lib.la
+
+libevolution_module_plugin_lib_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"evolution-plugin-lib\" \
-I$(top_srcdir) \
$(E_UTIL_CFLAGS)
-module_LTLIBRARIES = libevolution-module-plugin-lib.la
-
libevolution_module_plugin_lib_la_SOURCES = \
evolution-module-plugin-lib.c \
e-plugin-lib.c \
diff --git a/modules/plugin-mono/Makefile.am b/modules/plugin-mono/Makefile.am
index f4f436ae66..8c9ba8ed81 100644
--- a/modules/plugin-mono/Makefile.am
+++ b/modules/plugin-mono/Makefile.am
@@ -1,11 +1,12 @@
-AM_CPPFLAGS = \
+module_LTLIBRARIES = libevolution-module-plugin-mono.la
+
+libevolution_module_plugin_mono_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"evolution-plugin-mono\" \
-I$(top_srcdir) \
$(E_UTIL_CFLAGS) \
$(MONO_CFLAGS)
-module_LTLIBRARIES = libevolution-module-plugin-mono.la
-
libevolution_module_plugin_mono_la_SOURCES = \
evolution-module-plugin-mono.c \
e-plugin-mono.c \
diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am
index e6a32c3c83..4aaf14a7b2 100644
--- a/modules/plugin-python/Makefile.am
+++ b/modules/plugin-python/Makefile.am
@@ -1,11 +1,12 @@
-AM_CPPFLAGS = \
+module_LTLIBRARIES = libevolution-module-plugin-python.la
+
+libevolution_module_plugin_python_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"evolution-plugin-python\" \
-I$(top_srcdir) \
$(E_UTIL_CFLAGS) \
$(PY_INCLUDES)
-module_LTLIBRARIES = libevolution-module-plugin-python.la
-
libevolution_module_plugin_python_la_SOURCES = \
evolution-module-plugin-python.c \
e-plugin-python.c \
diff --git a/modules/plugin-python/example/Makefile.am b/modules/plugin-python/example/Makefile.am
index cc14dc94d9..57a18ec93d 100644
--- a/modules/plugin-python/example/Makefile.am
+++ b/modules/plugin-python/example/Makefile.am
@@ -1,7 +1,3 @@
-AM_CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"
-
@EVO_PLUGIN_RULE@
plugin_DATA = \
@@ -9,6 +5,11 @@ plugin_DATA = \
org-gnome-hello-python-ui.xml \
org-gnome-hello-python.eplug
+liborg_gnome_py_plug_test_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"
+
liborg_gnome_py_plug_test_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
errordir = $(privdatadir)/errors