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 /plugins/templates | |
| 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 'plugins/templates')
| -rw-r--r-- | plugins/templates/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 9104b3eb07..a64a10e1dd 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -10,10 +10,9 @@ liborg_gnome_templates_la_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + $(GTKHTML_CFLAGS) liborg_gnome_templates_la_SOURCES = templates.c @@ -24,8 +23,9 @@ liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-template-placeholders.schemas.in |