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 /widgets | |
| 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 'widgets')
| -rw-r--r-- | widgets/e-timezone-dialog/Makefile.am | 8 | ||||
| -rw-r--r-- | widgets/menus/Makefile.am | 3 | ||||
| -rw-r--r-- | widgets/misc/Makefile.am | 41 | ||||
| -rw-r--r-- | widgets/table/Makefile.am | 7 | ||||
| -rw-r--r-- | widgets/text/Makefile.am | 8 |
5 files changed, 43 insertions, 24 deletions
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index cdc88e3b08..d08bef18c2 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,13 +1,13 @@ -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libetimezonedialog.la + +libetimezonedialog_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ $(TZDIALOG_CFLAGS) -privsolib_LTLIBRARIES = \ - libetimezonedialog.la - libetimezonedialog_la_SOURCES = \ e-timezone-dialog.c \ e-timezone-dialog.h diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 1aadfcc1b0..920dae4685 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -1,6 +1,7 @@ privsolib_LTLIBRARIES = libmenus.la -AM_CPPFLAGS = \ +libmenus_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index ef3eba03d2..da75d752bb 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -2,18 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la endif -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/filter \ - -I$(top_srcdir)/widgets \ - -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DG_LOG_DOMAIN=__FILE__ \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) - -privsolib_LTLIBRARIES = \ - libemiscwidgets.la +privsolib_LTLIBRARIES = libemiscwidgets.la widgetsincludedir = $(privincludedir)/misc @@ -92,6 +81,17 @@ widgetsinclude_HEADERS = \ ea-cell-table.h \ ea-widgets.h +libemiscwidgets_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/filter \ + -I$(top_srcdir)/widgets \ + -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DG_LOG_DOMAIN=__FILE__ \ + $(EVOLUTION_MAIL_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) + libemiscwidgets_la_SOURCES = \ $(widgetsinclude_HEADERS) \ $(pilot_sources) \ @@ -172,8 +172,21 @@ noinst_PROGRAMS = \ test-dateedit \ test-preferences-window +test_widgets_misc_CPPFLAGS= \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/filter \ + -I$(top_srcdir)/widgets \ + -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DG_LOG_DOMAIN=__FILE__ \ + $(EVOLUTION_MAIL_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) + # test-calendar +test_calendar_CPPFLAGS = $(test_widgets_misc_CPPFLAGS) + test_calendar_SOURCES = \ test-calendar.c @@ -185,6 +198,8 @@ test_calendar_LDADD = \ # test-dateedit +test_dateedit_CPPFLAGS = $(test_widgets_misc_CPPFLAGS) + test_dateedit_SOURCES = \ test-dateedit.c @@ -196,6 +211,8 @@ test_dateedit_LDADD = \ # test-preferences-window +test_preferences_window_CPPFLAGS = $(test_widgets_misc_CPPFLAGS) + test_preferences_window_SOURCES = \ test-preferences-window.c diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 3ff3b732c6..56fc72d16a 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -2,7 +2,10 @@ glade_DATA = \ e-table-config.glade \ e-table-field-chooser.glade -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libetable.la + +libetable_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(E_UTIL_CFLAGS) \ @@ -11,8 +14,6 @@ AM_CPPFLAGS = \ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ -DG_LOG_DOMAIN=\"e-table\" -privsolib_LTLIBRARIES = libetable.la - libetable_la_SOURCES = \ e-cell.c \ e-cell-checkbox.c \ diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index ee426f4791..4c5314182f 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -2,16 +2,16 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la endif -AM_CPPFLAGS = \ +privsolib_LTLIBRARIES = libetext.la + +libetext_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(E_UTIL_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ -DG_LOG_DOMAIN=\"e-text\" - -privsolib_LTLIBRARIES = libetext.la - libetext_la_SOURCES = \ e-text-model-repos.c \ e-text-model.c \ |