aboutsummaryrefslogtreecommitdiffstats
path: root/capplet
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 /capplet
parent273b10a5baebd97bea4aeb1dae158f93ce93eb72 (diff)
downloadgsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar
gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.gz
gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.bz2
gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.lz
gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.xz
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 'capplet')
-rw-r--r--capplet/Makefile.am7
-rw-r--r--capplet/settings/Makefile.am8
2 files changed, 7 insertions, 8 deletions
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 14247f1fbb..f5b32eff7c 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -15,8 +15,8 @@ evolution_settings_CPPFLAGS = \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/smime/lib \
-I$(top_srcdir)/smime/gui \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_MAIL_CFLAGS) \
$(CERT_UI_CFLAGS) \
$(CANBERRA_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
@@ -42,13 +42,12 @@ evolution_settings_LDFLAGS = -mwindows
endif
evolution_settings_LDADD = \
- $(EVOLUTION_MAIL_LIBS) \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
$(CERT_UI_LIBS) \
$(CANBERRA_LIBS) \
$(GTKHTML_LIBS) \
- $(E_WIDGETS_LIBS) \
$(SMIME_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/mail/libevolution-mail.la \
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index dd8c3c9a45..9bd84db94b 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -16,10 +16,11 @@ libevolution_mail_settings_la_CPPFLAGS = \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/smime/lib \
-I$(top_srcdir)/smime/gui \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_MAIL_CFLAGS) \
$(CERT_UI_CFLAGS) \
$(CANBERRA_CFLAGS) \
+ $(GTKHTML_CFLAGS) \
-DANJAL_SETTINGS \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
@@ -52,13 +53,12 @@ libevolution_mail_settings_la_SOURCES = \
mail-guess-servers.h
libevolution_mail_settings_la_LIBADD = \
- $(EVOLUTION_MAIL_LIBS) \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
$(CERT_UI_LIBS) \
$(CANBERRA_LIBS) \
$(GTKHTML_LIBS) \
- $(E_WIDGETS_LIBS) \
$(SMIME_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/mail/libevolution-mail.la \