diff options
| author | H.Habighorst <h.habighorst@googlemail.com> | 2009-10-01 11:37:50 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-10-01 11:37:50 +0800 |
| commit | f62728b55e201ea92e682e07b3253ce4fb42d5af (patch) | |
| tree | 2083db9702cd5068e7fc4471c47086071e366015 /calendar/conduits | |
| parent | da3ae4fd5fa723abc4574d0459c761e76abba080 (diff) | |
| download | gsoc2013-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')
| -rw-r--r-- | calendar/conduits/calendar/Makefile.am | 12 | ||||
| -rw-r--r-- | calendar/conduits/common/Makefile.am | 20 | ||||
| -rw-r--r-- | calendar/conduits/memo/Makefile.am | 12 | ||||
| -rw-r--r-- | calendar/conduits/todo/Makefile.am | 15 |
4 files changed, 28 insertions, 31 deletions
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) |