From f62728b55e201ea92e682e07b3253ce4fb42d5af Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Wed, 30 Sep 2009 23:37:50 -0400 Subject: Bug 596848 - Use per-target CPPFLAGS in automake files --- calendar/conduits/common/Makefile.am | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'calendar/conduits/common') 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 -- cgit v1.2.3