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 /e-util | |
| 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 'e-util')
| -rw-r--r-- | e-util/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 42fda2d9dd..b5d4559cce 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -85,8 +85,8 @@ libeutil_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \ -DG_LOG_DOMAIN=\"e-utils\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ @@ -133,10 +133,10 @@ libeutil_la_SOURCES = \ libeutil_la_LDFLAGS = $(NO_UNDEFINED) -libeutil_la_LIBADD = \ - $(ICONV_LIBS) \ - $(E_UTIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ +libeutil_la_LIBADD = \ + $(ICONV_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(INTLLIBS) error_DATA = e-system.error |