aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-10-05 09:32:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-10-05 10:27:14 +0800
commit1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba (patch)
tree8b3d99bcac99c3a3edbb2939ea0226c187a39eb4 /shell
parent273b10a5baebd97bea4aeb1dae158f93ce93eb72 (diff)
downloadgsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.gz
gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.zst
gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.zip
Simplify library dependency flags.
We have a confusing array of nearly-identical CFLAGS/LIBS definitions in configure.ac. Time to simplify. Instead let's just have one definition that includes all the libraries provided by Evolution-Data-Server (incl. Camel). That, in combination with GNOME_PLATFORM, gives us most of what we need for compliation and linking, and we can sprinkle definitions for additional library dependencies in Makefile.am's as needed.
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am17
1 files changed, 7 insertions, 10 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2b312038ba..ad9a0bb308 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -61,9 +61,8 @@ libeshell_la_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(EGG_SMCLIENT_CFLAGS) \
- $(CLUTTER_CFLAGS) \
- $(TZDIALOG_CFLAGS) \
- $(SHELL_CFLAGS)
+ $(GTKHTML_CFLAGS) \
+ $(CLUTTER_CFLAGS)
libeshell_la_SOURCES = \
$(eshellinclude_HEADERS) \
@@ -99,8 +98,7 @@ libeshell_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(EGG_SMCLIENT_LIBS) \
- $(CLUTTER_LIBS) \
- $(SHELL_LIBS)
+ $(CLUTTER_LIBS)
# Evolution executable
@@ -131,10 +129,10 @@ evolution_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(datadir)"\" \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(TZDIALOG_CFLAGS) \
- $(CLUTTER_CFLAGS) \
- $(SHELL_CFLAGS)
+ $(GTKHTML_CFLAGS) \
+ $(CLUTTER_CFLAGS)
evolution_SOURCES = \
main.c
@@ -146,8 +144,7 @@ evolution_LDADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/filter/libfilter.la \
- $(TZDIALOG_LIBS) \
- $(SHELL_LIBS) \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(CLUTTER_LIBS) \
$(EVOLUTIONICON)