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 /addressbook/gui | |
| 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 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/gui/merging/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 29ddb6ee9c..588dcc51f7 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -2,7 +2,10 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la endif -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libecontacteditor.la + +libecontacteditor_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ @@ -14,9 +17,6 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"contact-editor\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -privsolib_LTLIBRARIES = \ - libecontacteditor.la - libecontacteditor_la_SOURCES = \ eab-editor.c \ eab-editor.h \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 63774863a4..71ef3703b0 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -2,7 +2,10 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la endif -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libecontactlisteditor.la + +libecontactlisteditor_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ @@ -13,9 +16,6 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -privsolib_LTLIBRARIES = \ - libecontactlisteditor.la - libecontactlisteditor_la_SOURCES = \ e-contact-list-editor.c \ e-contact-list-editor.h \ diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index e399c19747..92f9dc6ef6 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -1,4 +1,7 @@ -AM_CPPFLAGS = \ +noinst_LTLIBRARIES = libeabbookmerging.la + +libeabbookmerging_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"eab-contact-merging\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -I$(top_srcdir) \ @@ -6,9 +9,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/addressbook \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LTLIBRARIES = \ - libeabbookmerging.la - libeabbookmerging_la_SOURCES = \ eab-contact-compare.c \ eab-contact-compare.h \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index e9075802d1..ffe064a349 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,7 +1,10 @@ ruledir = $(privdatadir) rule_DATA = addresstypes.xml -AM_CPPFLAGS = \ +noinst_LTLIBRARIES = libeabwidgets.la + +libeabwidgets_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"eab-widgets\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ @@ -17,9 +20,6 @@ AM_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -noinst_LTLIBRARIES = \ - libeabwidgets.la - eabincludedir = $(privincludedir)/addressbook/gui/widgets eabinclude_HEADERS = \ |