diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
| commit | 4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch) | |
| tree | d16ce30e77dd539c03509237dd4c723d46aea97a /capplet/Makefile.am | |
| parent | 5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff) | |
| parent | 19163c2b71e6128fc9b32287b99b1f4422324c2d (diff) | |
| download | gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2 gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip | |
Merge from master
Diffstat (limited to 'capplet/Makefile.am')
| -rw-r--r-- | capplet/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/capplet/Makefile.am b/capplet/Makefile.am index 14247f1fbb..f5b32eff7c 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -15,8 +15,8 @@ evolution_settings_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/smime/lib \ -I$(top_srcdir)/smime/gui \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ @@ -42,13 +42,12 @@ evolution_settings_LDFLAGS = -mwindows endif evolution_settings_LDADD = \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/mail/libevolution-mail.la \ |