From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 31 Jan 2009 19:03:12 +0000 Subject: Merge revisions 37108:37199 from trunk. svn path=/branches/kill-bonobo/; revision=37200 --- plugins/external-editor/Makefile.am | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 0c7c22ab8b..bae2c640a5 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,3 +1,11 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la +endif + INCLUDES = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ @@ -25,7 +33,10 @@ plugin_LTLIBRARIES = liborg-gnome-external-editor.la liborg_gnome_external_editor_la_SOURCES = \ external-editor.c -liborg_gnome_external_editor_la_LDFLAGS = -module -avoid-version +liborg_gnome_external_editor_la_LDFLAGS = \ + -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_external_editor_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-external-editor.schemas.in -- cgit v1.2.3 From 3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Apr 2009 11:34:11 +0200 Subject: Define .error files correctly and external-editor crash fix ** Fix for bug #561188 --- plugins/external-editor/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index bae2c640a5..ff64941a28 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = \ @EVO_PLUGIN_RULE@ -error_DATA = org-gnome-external-editor-errors.xml +error_DATA = org-gnome-external-editor.error errordir = $(privdatadir)/errors plugin_DATA = \ @@ -53,12 +53,12 @@ install-data-local: EXTRA_DIST = \ org-gnome-external-editor.eplug.xml \ - org-gnome-external-editor-errors.xml \ + org-gnome-external-editor.error.xml \ org-gnome-external-editor.xml \ $(schema_in_files) BUILT_SOURCES = org-gnome-external-editor.eplug \ - $(error_i18n) + org-gnome-external-editor.error CLEANFILES = $(BUILT_SOURCES) -- cgit v1.2.3 From d7e7b7ddd4e86a34ffbf240fdc887b10d363dd12 Mon Sep 17 00:00:00 2001 From: Holger Macht Date: Tue, 28 Apr 2009 20:40:26 +0530 Subject: External Editor rewrite by Holger Macht. Fixes #567145 --- plugins/external-editor/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index ff64941a28..36cba20344 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -25,8 +25,7 @@ error_DATA = org-gnome-external-editor.error errordir = $(privdatadir)/errors plugin_DATA = \ - org-gnome-external-editor.eplug \ - org-gnome-external-editor.xml + org-gnome-external-editor.eplug plugin_LTLIBRARIES = liborg-gnome-external-editor.la @@ -54,7 +53,6 @@ install-data-local: EXTRA_DIST = \ org-gnome-external-editor.eplug.xml \ org-gnome-external-editor.error.xml \ - org-gnome-external-editor.xml \ $(schema_in_files) BUILT_SOURCES = org-gnome-external-editor.eplug \ -- cgit v1.2.3 From 504642b7984f5fed0db6284e2f4da6b1c9b8d1e0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 11:09:30 -0400 Subject: Use Behdad's brilliant git.mk to generate .gitignore files. --- plugins/external-editor/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 36cba20344..0a39bc41e4 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -61,3 +61,5 @@ BUILT_SOURCES = org-gnome-external-editor.eplug \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk -- cgit v1.2.3 From f4cf9af33ccde3142a3011e8b2dbcfb4cbc9ae81 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 20 May 2009 16:50:00 +0200 Subject: Use -no-undefined on Linux too There still left two things opened, search for KILL-BONOBO to find them. One is in calendar's Makefile.am, one in composer. --- plugins/external-editor/Makefile.am | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 4373b81ee5..76234e3533 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,11 +1,3 @@ -if OS_WIN32 -NO_UNDEFINED_REQUIRED_LIBS = \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la -endif - INCLUDES = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ @@ -35,8 +27,15 @@ liborg_gnome_external_editor_la_SOURCES = \ liborg_gnome_external_editor_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_external_editor_la_LIBADD = \ - $(NO_UNDEFINED_REQUIRED_LIBS) +liborg_gnome_external_editor_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ + $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ + $(top_builddir)/mail/libevolution-module-mail.la \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-external-editor.schemas.in -- cgit v1.2.3 From f0d3f3afdfa314e1e8cd7d8da790878008a46aad Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 12:59:33 -0400 Subject: Radically reorganize source code. - Collect all shell modules into a new top-level 'modules' directory: $(top_srcdir)/modules/addressbook $(top_srcdir)/modules/calendar $(top_srcdir)/modules/mail Nothing is allowed to link to these, not plugins nor other modules. THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X. - Mimic the libevolution-mail-shared library from master (except drop the "shared" suffix) and have libevolution-mail-importers and all mail-related plugins link to it. - Discard the a11y subdirectories and have the files live alongside their counterpart widgets. --- plugins/external-editor/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 76234e3533..b5ec612403 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -33,7 +33,7 @@ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/mail/libevolution-module-mail.la \ + $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) -- cgit v1.2.3 From bfc5ba2511dc5fd9f5aa9868946c8860afad81bf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 18:34:08 -0400 Subject: Fix "make distcheck" errors and other build cleanups. --- plugins/external-editor/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/external-editor/Makefile.am') diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index b5ec612403..c05b22a3c5 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ -- cgit v1.2.3