aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/conduits/common
diff options
context:
space:
mode:
authorH.Habighorst <h.habighorst@googlemail.com>2009-10-01 11:37:50 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-01 11:37:50 +0800
commitf62728b55e201ea92e682e07b3253ce4fb42d5af (patch)
tree2083db9702cd5068e7fc4471c47086071e366015 /calendar/conduits/common
parentda3ae4fd5fa723abc4574d0459c761e76abba080 (diff)
downloadgsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar
gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.gz
gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.bz2
gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.lz
gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.xz
gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.zst
gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.zip
Bug 596848 - Use per-target CPPFLAGS in automake files
Diffstat (limited to 'calendar/conduits/common')
-rw-r--r--calendar/conduits/common/Makefile.am20
1 files changed, 9 insertions, 11 deletions
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