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 /e-util | |
parent | da3ae4fd5fa723abc4574d0459c761e76abba080 (diff) | |
download | gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.gz gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.tar.zst gsoc2013-evolution-f62728b55e201ea92e682e07b3253ce4fb42d5af.zip |
Bug 596848 - Use per-target CPPFLAGS in automake files
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/Makefile.am | 86 |
1 files changed, 58 insertions, 28 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 2f6602f9f0..a869cf1667 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -7,34 +7,6 @@ if OS_WIN32 PLATFORM_SOURCES = e-win32-reloc.c endif -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/widgets \ - -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ - -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ - -DEVOLUTION_LIBDIR=\""$(datadir)"\" \ - -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ - -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ - -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \ - -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ - -DSEARCH_RULE_DIR=\"$(ruledir)\" \ - -DG_LOG_DOMAIN=\"e-utils\" \ - $(GNOME_PILOT_CFLAGS) \ - $(E_UTIL_CFLAGS) - privsolib_LTLIBRARIES = libeutil.la libeconduit.la eutilinclude_HEADERS = \ @@ -77,6 +49,35 @@ eutilinclude_HEADERS = \ e-unicode.h \ e-xml-utils.h +libeutil_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/widgets \ + -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ + -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_LIBDIR=\""$(datadir)"\" \ + -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ + -DEVOLUTION_PREFIX=\""$(prefix)"\" \ + -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ + -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ + -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \ + -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DSEARCH_RULE_DIR=\"$(ruledir)\" \ + -DG_LOG_DOMAIN=\"e-utils\" \ + $(GNOME_PILOT_CFLAGS) \ + $(E_UTIL_CFLAGS) + libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ e-account-utils.c \ @@ -147,6 +148,35 @@ else pilot_compile = e-html-utils.c endif +libeconduit_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/widgets \ + -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ + -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_LIBDIR=\""$(datadir)"\" \ + -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ + -DEVOLUTION_PREFIX=\""$(prefix)"\" \ + -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ + -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ + -DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\" \ + -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DSEARCH_RULE_DIR=\"$(ruledir)\" \ + -DG_LOG_DOMAIN=\"e-utils\" \ + $(GNOME_PILOT_CFLAGS) \ + $(E_UTIL_CFLAGS) + libeconduit_la_SOURCES = $(pilot_compile) libeconduit_la_LDFLAGS = $(NO_UNDEFINED) |