aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorH.Habighorst <h.habighorst@googlemail.com>2009-10-01 11:37:50 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-01 11:37:50 +0800
commitf62728b55e201ea92e682e07b3253ce4fb42d5af (patch)
tree2083db9702cd5068e7fc4471c47086071e366015 /shell
parentda3ae4fd5fa723abc4574d0459c761e76abba080 (diff)
downloadgsoc2013-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 'shell')
-rw-r--r--shell/Makefile.am88
-rw-r--r--shell/test/Makefile.am3
2 files changed, 58 insertions, 33 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c1e4b11a75..d8eea3c5e3 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -2,46 +2,18 @@ if ENABLE_TEST_COMPONENT
SUBDIRS = . test
endif
-AM_CPPFLAGS = \
- -I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/menus \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_srcdir) \
- -I$(top_srcdir)/shell \
- -DEVOLUTION_BINDIR=\""$(bindir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \
- -DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \
- -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
- -DPREFIX=\""$(prefix)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DLIBDIR=\""$(datadir)"\" \
- -DG_LOG_DOMAIN=\"evolution-shell\" \
- $(TZDIALOG_CFLAGS) \
- $(SHELL_CFLAGS)
-
if NM_SUPPORT
-AM_CPPFLAGS += \
+NM_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \
$(NM_CFLAGS)
+NM_SUPPORT_FILES = e-shell-nm.c
endif
+# Executable
bin_PROGRAMS = evolution
-if NM_SUPPORT
-NM_SUPPORT_FILES = e-shell-nm.c
-endif
-
# Shell library
-
-privsolib_LTLIBRARIES = \
- libeshell.la
+privsolib_LTLIBRARIES = libeshell.la
eshellincludedir = $(privincludedir)/shell
@@ -59,6 +31,32 @@ eshellinclude_HEADERS = \
e-shell-window-actions.h \
es-event.h
+libeshell_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(NM_CPPFLAGS) \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/menus \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/shell \
+ -DEVOLUTION_BINDIR=\""$(bindir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
+ -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \
+ -DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DLIBDIR=\""$(datadir)"\" \
+ -DG_LOG_DOMAIN=\"evolution-shell\" \
+ $(TZDIALOG_CFLAGS) \
+ $(SHELL_CFLAGS)
+
libeshell_la_SOURCES = \
$(NM_SUPPORT_FILES) \
$(IDL_GENERATED) \
@@ -99,6 +97,32 @@ if HAVE_WINDRES
EVOLUTIONICONRC = evolution-icon.o
endif
+evolution_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(NM_CPPFLAGS) \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/menus \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/shell \
+ -DEVOLUTION_BINDIR=\""$(bindir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
+ -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \
+ -DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DLIBDIR=\""$(datadir)"\" \
+ -DG_LOG_DOMAIN=\"evolution-shell\" \
+ $(TZDIALOG_CFLAGS) \
+ $(SHELL_CFLAGS)
+
evolution_SOURCES = \
e-config-upgrade.c \
e-config-upgrade.h \
diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am
index 10b1bfb81b..0756a472a3 100644
--- a/shell/test/Makefile.am
+++ b/shell/test/Makefile.am
@@ -1,6 +1,7 @@
module_LTLIBRARIES = libevolution-module-test.la
-AM_CPPFLAGS = \
+libevolution_module_test_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/widgets \