aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/vcard-inline
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 /plugins/vcard-inline
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 'plugins/vcard-inline')
-rw-r--r--plugins/vcard-inline/Makefile.am22
1 files changed, 11 insertions, 11 deletions
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index f595145418..07b747af79 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -15,23 +15,23 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
- $(EVOLUTION_MAIL_CFLAGS)
+ $(GTKHTML_CFLAGS)
liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_vcard_inline_la_LIBADD = \
- $(top_builddir)/mail/libevolution-mail.la \
- $(top_builddir)/addressbook/util/libeabutil.la \
- $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
- $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
- $(top_builddir)/addressbook/printing/libecontactprint.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(EVOLUTION_MAIL_LIBS) \
- $(GNOME_PLATFORM_LIBS)
+liborg_gnome_vcard_inline_la_LIBADD = \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(top_builddir)/addressbook/util/libeabutil.la \
+ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
+ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
+ $(top_builddir)/addressbook/printing/libecontactprint.la \
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
+ $(GTKHTML_LIBS)
EXTRA_DIST = org-gnome-vcard-inline.eplug.xml