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/backup-restore | |
| 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 'plugins/backup-restore')
| -rw-r--r-- | plugins/backup-restore/Makefile.am | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index c4e033f733..05748c24c5 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -16,18 +16,18 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_backup_restore_la_SOURCES = backup-restore.c liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(SHELL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c @@ -41,14 +41,12 @@ evolution_backup_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) evolution_backup_LDADD = \ $(top_builddir)/e-util/libeutil.la \ - $(SHELL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) if OS_WIN32 |