aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/common/Makefile.am3
-rw-r--r--calendar/conduits/calendar/Makefile.am12
-rw-r--r--calendar/conduits/common/Makefile.am20
-rw-r--r--calendar/conduits/memo/Makefile.am12
-rw-r--r--calendar/conduits/todo/Makefile.am15
-rw-r--r--calendar/gui/Makefile.am3
-rw-r--r--calendar/gui/alarm-notify/Makefile.am3
-rw-r--r--calendar/gui/dialogs/Makefile.am7
-rw-r--r--calendar/importers/Makefile.am3
9 files changed, 40 insertions, 38 deletions
diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am
index 9947a6cb65..342a9b6df5 100644
--- a/calendar/common/Makefile.am
+++ b/calendar/common/Makefile.am
@@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libevolution-calendarprivate.la
-AM_CPPFLAGS = \
+libevolution_calendarprivate_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"calendar-gui\" \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index c3eca002a3..6a5dc513a2 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -1,4 +1,8 @@
-AM_CPPFLAGS = \
+# Calendar Conduit
+privconduit_LTLIBRARIES = libecalendar_conduit.la
+
+libecalendar_conduit_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
-I$(top_srcdir)/widgets/misc \
@@ -7,11 +11,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/calendar/conduits/common \
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-# Calendar Conduit
-privconduit_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = \
- calendar-conduit.c
+libecalendar_conduit_la_SOURCES = calendar-conduit.c
libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am
index 457d4eb77d..89b1288080 100644
--- a/calendar/conduits/common/Makefile.am
+++ b/calendar/conduits/common/Makefile.am
@@ -1,26 +1,24 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
+# Calendar Conduit library
+privconduit_LTLIBRARIES = libecalendar_common_conduit.la
+
+libecalendar_common_conduit_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-# Calendar Conduit library
-privconduit_LTLIBRARIES = libecalendar_common_conduit.la
-
ecalendar_common_conduitincludedir = $(privincludedir)/calendar/conduits/common
-ecalendar_common_conduitinclude_HEADERS = \
- libecalendar-common-conduit.h
+ecalendar_common_conduitinclude_HEADERS = libecalendar-common-conduit.h
-libecalendar_common_conduit_la_SOURCES = \
- libecalendar-common-conduit.c
+libecalendar_common_conduit_la_SOURCES = libecalendar-common-conduit.c
libecalendar_common_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
libecalendar_common_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/e-util/libeconduit.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-
-include $(top_srcdir)/git.mk
diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am
index b8502cba89..84ccf1b9d9 100644
--- a/calendar/conduits/memo/Makefile.am
+++ b/calendar/conduits/memo/Makefile.am
@@ -1,4 +1,8 @@
-AM_CPPFLAGS = \
+# Memo Conduit
+privconduit_LTLIBRARIES = libememo_conduit.la
+
+libememo_conduit_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
-I$(top_srcdir)/widgets/misc \
@@ -7,11 +11,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/calendar/conduits/common \
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-# Memo Conduit
-privconduit_LTLIBRARIES = libememo_conduit.la
-
-libememo_conduit_la_SOURCES = \
- memo-conduit.c
+libememo_conduit_la_SOURCES = memo-conduit.c
libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index f17535f6de..782067a903 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -1,4 +1,8 @@
-AM_CPPFLAGS = \
+# ToDo Conduit
+privconduit_LTLIBRARIES = libetodo_conduit.la
+
+libetodo_conduit_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
-I$(top_srcdir)/widgets/misc \
@@ -7,11 +11,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/calendar/conduits/common \
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-# ToDo Conduit
-privconduit_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = \
- todo-conduit.c
+libetodo_conduit_la_SOURCES = todo-conduit.c
libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
@@ -34,8 +34,7 @@ conduit_DATA = e-todo.conduit
BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = \
- e-todo.conduit.in
+EXTRA_DIST = e-todo.conduit.in
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 6c20d5febf..dd1357c6c5 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -52,7 +52,8 @@ search_files = tasktypes.xml memotypes.xml caltypes.xml
ruledir = $(privdatadir)
rule_DATA = $(search_files)
-AM_CPPFLAGS = \
+libevolution_calendar_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"calendar-gui\" \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 7fce7dbc23..cd5033199a 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -1,6 +1,7 @@
bin_PROGRAMS = evolution-alarm-notify
-AM_CPPFLAGS = \
+evolution_alarm_notify_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"evolution-alarm-notify\" \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 3bcbadcb16..fb745fd9dc 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS = \
+noinst_LTLIBRARIES = libcal-dialogs.la
+
+libcal_dialogs_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"calendar-gui\" \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
@@ -46,8 +49,6 @@ ecalendarinclude_HEADERS = \
task-details-page.h \
task-page.h
-noinst_LTLIBRARIES = libcal-dialogs.la
-
libcal_dialogs_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(GNOME_PLATFORM_LIBS)
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 8fa711b035..e1788106ab 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -1,6 +1,7 @@
privsolib_LTLIBRARIES = libevolution-calendar-importers.la
-AM_CPPFLAGS = \
+libevolution_calendar_importers_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \
-DG_LOG_DOMAIN=\"Evolution-Importer\" \
-I$(top_srcdir) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 03:22:11 +0800