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 /composer | |
| parent | 273b10a5baebd97bea4aeb1dae158f93ce93eb72 (diff) | |
| download | gsoc2013-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 'composer')
| -rw-r--r-- | composer/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/composer/Makefile.am b/composer/Makefile.am index 5cd2eab05c..013d04c8bd 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -37,8 +37,9 @@ libcomposer_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\"$(uidir)\" \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"composer\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) libcomposer_la_SOURCES = \ $(libcomposerinclude_HEADERS) \ @@ -62,8 +63,9 @@ libcomposer_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) ui_DATA = evolution-composer.ui |