aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-02-03 22:26:31 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-02-03 22:26:31 +0800
commit9ede7a7fb4df9623b5dacc7962645550e1866129 (patch)
treec6bb329097e6b3c94f08a84011f14006c95f6160 /shell
parent6db981fa566574d16f4664687d26147acde7ad80 (diff)
downloadgsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.tar
gsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.tar.gz
gsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.tar.bz2
gsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.tar.lz
gsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.tar.xz
gsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.tar.zst
gsoc2013-evolution-9ede7a7fb4df9623b5dacc7962645550e1866129.zip
Enforce unique-1.0 >= 1.1.2 build requirement.
Also, add unique-1.0 to GNOME_PLATFORM so it's included in CFLAGS and LIBADD variables everywhere.
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/test/Makefile.am4
2 files changed, 2 insertions, 3 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index b941ee2753..cdf1efc32d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -123,6 +123,7 @@ evolution_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(datadir)"\" \
+ $(GNOME_PLATFORM_CFLAGS) \
$(TZDIALOG_CFLAGS) \
$(SHELL_CFLAGS)
diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am
index 7ba2eaf55b..5efa3785d6 100644
--- a/shell/test/Makefile.am
+++ b/shell/test/Makefile.am
@@ -9,8 +9,7 @@ libevolution_module_test_la_CPPFLAGS = \
-I$(top_srcdir)/widgets/misc \
-I$(top_builddir)/shell \
-DG_LOG_DOMAIN=\"evolution-test\" \
- $(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_TEST_CFLAGS)
+ $(GNOME_PLATFORM_CFLAGS)
libevolution_module_test_la_SOURCES = \
evolution-module-test.c \
@@ -21,7 +20,6 @@ libevolution_module_test_la_SOURCES = \
libevolution_module_test_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
- $(EVOLUTION_TEST_LIBS) \
$(GNOME_PLATFORM_LIBS)
libevolution_module_test_la_LDFLAGS = \