diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-10-05 09:32:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-05 10:27:14 +0800 |
| commit | 1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba (patch) | |
| tree | 8b3d99bcac99c3a3edbb2939ea0226c187a39eb4 /modules/addressbook | |
| parent | 273b10a5baebd97bea4aeb1dae158f93ce93eb72 (diff) | |
| download | gsoc2013-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 'modules/addressbook')
| -rw-r--r-- | modules/addressbook/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index b6dec30b0a..5757ac2e74 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -19,8 +19,9 @@ libevolution_module_addressbook_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LDAP_CFLAGS) \ $(CHAMPLAIN_CFLAGS) @@ -72,8 +73,9 @@ libevolution_module_addressbook_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ $(LDAP_LIBS) |