From 9ede7a7fb4df9623b5dacc7962645550e1866129 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Feb 2010 09:26:31 -0500 Subject: 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. --- shell/Makefile.am | 1 + shell/test/Makefile.am | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'shell') 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 = \ -- cgit v1.2.3