tomboy r2285 - in trunk: . Mono.Addins po

[sharm svn gnome org]

Author: sharm
Date: Wed Jan 21 18:45:31 2009
New Revision: 2285
URL: http://svn.gnome.org/viewvc/tomboy?rev=2285&view=rev

Log:
* tomboy/Makefile.am:
* tomboy/Mono.Addins:
* tomboy/configure.in:
* tomboy/po/POTFILES.in:
* tomboy/Makefile.include: Removing bundled Mono.Addins.  Mono.Addins
  0.3 or greater is now required (0.4 recommended).

Removed:
   trunk/Mono.Addins/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/Makefile.include
   trunk/configure.in
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jan 21 18:45:31 2009
@@ -1,5 +1,5 @@
 
-SUBDIRS = data libtomboy Mono.Addins Tomboy test po help
+SUBDIRS = data libtomboy Tomboy test po help
 
 EXTRA_DIST = 			\
 	gnome-doc-utils.make	\

Modified: trunk/Makefile.include
==============================================================================
--- trunk/Makefile.include	(original)
+++ trunk/Makefile.include	Wed Jan 21 18:45:31 2009
@@ -1,24 +1,11 @@
 ## Makefile.include
 
-## Directories
-
-DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
-
 ## Links
 
 LINK_TOMBOY_EXE =					\
 	-r:$(top_builddir)/Tomboy/Tomboy.exe
 
-if EXTERNAL_MONO_ADDINS
 LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
-else
-LINK_MONO_ADDINS =					\
-	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
-	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
-	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-endif
 
 ## Build
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jan 21 18:45:31 2009
@@ -151,18 +151,11 @@
 AC_SUBST(DBUS_LIBS)
 
 #
-# Check for external Mono.Addins
+# Check for Mono.Addins
 #
 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= 0.3 \
 	mono-addins-gui >= 0.3 \
-	mono-addins-setup >= 0.3,
-	have_external_mono_addins="yes", have_external_mono_addins="no")
-
-if test "x$have_external_mono_addins" != "xyes"; then
-	AC_MSG_RESULT([using internal copy])
-fi
-AM_CONDITIONAL(EXTERNAL_MONO_ADDINS, test "x$have_external_mono_addins" = "xyes")
-AC_SUBST(MONO_ADDINS_LIBS)
+	mono-addins-setup >= 0.3)
 
 #
 # Tomboy.exe needs Gtk# Gnome# GConf#
@@ -325,10 +318,6 @@
 data/icons/Makefile
 help/Makefile
 libtomboy/Makefile
-Mono.Addins/Makefile
-Mono.Addins/Mono.Addins.Setup/Makefile
-Mono.Addins/Mono.Addins.Gui/Makefile
-Mono.Addins/Mono.Addins/Makefile
 Tomboy/Makefile
 Tomboy/Addins/Makefile
 Tomboy/Addins/Backlinks/Makefile

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Jan 21 18:45:31 2009
@@ -6,7 +6,6 @@
 data/GNOME_TomboyApplet.xml
 data/tomboy.desktop.in
 data/tomboy.schemas.in
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinTreeWidget.cs
 Tomboy/ActionManager.cs
 Tomboy/AddinManager.cs
 Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs