From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- plugins/templates/ChangeLog | 10 ++++++++++ plugins/templates/Makefile.am | 27 ++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) (limited to 'plugins/templates') diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog index c559689e43..e1157ef1d9 100644 --- a/plugins/templates/ChangeLog +++ b/plugins/templates/ChangeLog @@ -1,3 +1,13 @@ +2008-08-12 Bharath Acharya + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya + + * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate + dlls on Windows. + 2008-07-21 Johnny Jacob * templates.c: Remove unused header files. diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index f43dce0992..5a36917fa2 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -15,7 +15,11 @@ plugin_DATA = \ plugin_LTLIBRARIES = liborg-gnome-templates.la liborg_gnome_templates_la_SOURCES = templates.c -liborg_gnome_templates_la_LDFLAGS = -module -avoid-version +liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_templates_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-template-placeholders.schemas.in @@ -23,12 +27,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = org-gnome-templates.eplug.xml \ $(schema_in_files) \ -- cgit