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 /plugins/caldav | |
| 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 'plugins/caldav')
| -rw-r--r-- | plugins/caldav/Makefile.am | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index f75d1c0f4c..6d89204eff 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -3,25 +3,23 @@ plugin_DATA = org-gnome-evolution-caldav.eplug plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la -liborg_gnome_evolution_caldav_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I . \ - -I$(top_srcdir) \ - -DCALDAV_UIDIR=\""$(uidir)"\" \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBSOUP_CFLAGS) - -liborg_gnome_evolution_caldav_la_SOURCES = \ - caldav-source.c \ - caldav-browse-server.h \ +liborg_gnome_evolution_caldav_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I . \ + -I$(top_srcdir) \ + -DCALDAV_UIDIR=\""$(uidir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) + +liborg_gnome_evolution_caldav_la_SOURCES = \ + caldav-source.c \ + caldav-browse-server.h \ caldav-browse-server.c -liborg_gnome_evolution_caldav_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ +liborg_gnome_evolution_caldav_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) \ - $(LIBSOUP_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) |