GNOME.org
 

[f-spot] no longer bundle mono-addins

commit ecceb255de64fc2ca966d6ef0eca163cb0ba9f54
Author: Stephane Delcroix <stephane delcroix org>
Date:   Sat Nov 7 14:31:54 2009 +0100

    no longer bundle mono-addins

 Makefile.addins                                    |    6 +-
 Makefile.include                                   |    7 -
 configure.ac                                       |    8 +-
 extensions/Exporters/FacebookExport/Makefile.am    |    1 -
 extensions/Exporters/FlickrExport/Makefile.am      |    1 -
 extensions/Exporters/FolderExport/Makefile.am      |    1 -
 extensions/Exporters/GalleryExport/Makefile.am     |    1 -
 extensions/Exporters/PicasaWebExport/Makefile.am   |    1 -
 extensions/Exporters/SmugMugExport/Makefile.am     |    1 -
 extensions/Exporters/TabbloExport/Makefile.am      |    1 -
 extensions/Exporters/ZipExport/Makefile.am         |    4 +-
 lib/Makefile.am                                    |    1 -
 lib/mono-addins/.gitignore                         |    4 -
 lib/mono-addins/AUTHORS                            |    3 -
 lib/mono-addins/Makefile.am                        |    4 -
 lib/mono-addins/Mono.Addins.Gui/.gitignore         |    4 -
 lib/mono-addins/Mono.Addins.Gui/AssemblyInfo.cs    |   20 -
 lib/mono-addins/Mono.Addins.Gui/Makefile.am        |   69 -
 .../Mono.Addins.Gui/AddinInfoDialog.cs             |   89 --
 .../Mono.Addins.Gui/AddinInstallDialog.cs          |  631 --------
 .../Mono.Addins.Gui/AddinInstaller.cs              |   25 -
 .../Mono.Addins.Gui/AddinInstallerDialog.cs        |  178 ---
 .../Mono.Addins.Gui/AddinManagerDialog.cs          |  183 ---
 .../Mono.Addins.Gui/AddinManagerWindow.cs          |   72 -
 .../Mono.Addins.Gui/AddinTreeWidget.cs             |  375 -----
 .../Mono.Addins.Gui/Mono.Addins.Gui/ErrorDialog.cs |   97 --
 .../Mono.Addins.Gui/ManageSitesDialog.cs           |  118 --
 .../Mono.Addins.Gui/NewSiteDialog.cs               |  115 --
 .../Mono.Addins.Gui/Mono.Addins.Gui/Services.cs    |   81 -
 .../gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs     |  110 --
 .../gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs  |  572 -------
 .../Mono.Addins.Gui.AddinInstallerDialog.cs        |  146 --
 .../gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs  |  326 ----
 .../gtk-gui/Mono.Addins.Gui.ErrorDialog.cs         |  145 --
 .../gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs   |  124 --
 .../gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs       |  234 ---
 .../Mono.Addins.Gui/gtk-gui/generated.cs           |   68 -
 lib/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic | 1648 --------------------
 .../Mono.Addins.Gui/icons/package-x-generic.png    |  Bin 2095 -> 0 bytes
 .../Mono.Addins.Gui/icons/package-x-generic_16.png |  Bin 540 -> 0 bytes
 .../Mono.Addins.Gui/icons/package-x-generic_22.png |  Bin 695 -> 0 bytes
 .../icons/system-software-update.png               |  Bin 3840 -> 0 bytes
 .../Mono.Addins.Gui/icons/user-package.png         |  Bin 964 -> 0 bytes
 lib/mono-addins/Mono.Addins.Setup/.gitignore       |    4 -
 lib/mono-addins/Mono.Addins.Setup/AssemblyInfo.cs  |   20 -
 lib/mono-addins/Mono.Addins.Setup/Makefile.am      |   63 -
 .../ConsoleProgressMonitor.cs                      |  208 ---
 .../LogTextWriter.cs                               |   89 --
 .../NullProgressMonitor.cs                         |  165 --
 .../ProgressStatusMonitor.cs                       |  119 --
 .../ProgressTracker.cs                             |  147 --
 .../Mono.Addins.Setup/AddinInfo.cs                 |  272 ----
 .../Mono.Addins.Setup/AddinInfoCollection.cs       |   45 -
 .../Mono.Addins.Setup/AddinPackage.cs              |  324 ----
 .../Mono.Addins.Setup/AddinRepositoryEntry.cs      |   84 -
 .../Mono.Addins.Setup/AddinStore.cs                |  675 --------
 .../Mono.Addins.Setup/AddinSystemConfiguration.cs  |   64 -
 .../AddinSystemConfigurationReaderWriter.cs        |  387 -----
 .../AddinSystemConfigurationSerializer.cs          |   64 -
 .../Mono.Addins.Setup/ConsoleAddinInstaller.cs     |  123 --
 .../Mono.Addins.Setup/IProgressMonitor.cs          |   51 -
 .../Mono.Addins.Setup/InstallException.cs          |   43 -
 .../Mono.Addins.Setup/NativePackage.cs             |   73 -
 .../Mono.Addins.Setup/Mono.Addins.Setup/Package.cs |   90 --
 .../Mono.Addins.Setup/PackageCollection.cs         |   68 -
 .../Mono.Addins.Setup/ReferenceRepositoryEntry.cs  |   43 -
 .../Mono.Addins.Setup/Repository.cs                |  102 --
 .../Mono.Addins.Setup/RepositoryEntry.cs           |   48 -
 .../Mono.Addins.Setup/RepositoryEntryCollection.cs |   67 -
 .../Mono.Addins.Setup/RepositoryReaderWriter.cs    |  894 -----------
 .../Mono.Addins.Setup/RepositoryRecord.cs          |  126 --
 .../Mono.Addins.Setup/RepositoryRegistry.cs        |  323 ----
 .../Mono.Addins.Setup/RepositorySerializer.cs      |   64 -
 .../Mono.Addins.Setup/SetupService.cs              |  370 -----
 .../Mono.Addins.Setup/SetupTool.cs                 |  964 ------------
 lib/mono-addins/Mono.Addins/.gitignore             |    4 -
 lib/mono-addins/Mono.Addins/AssemblyInfo.cs        |   20 -
 lib/mono-addins/Mono.Addins/Makefile.am            |  115 --
 .../Mono.Addins.Database/AddinDatabase.cs          | 1466 -----------------
 .../Mono.Addins.Database/AddinHostIndex.cs         |  108 --
 .../Mono.Addins.Database/AddinScanFolderInfo.cs    |  266 ----
 .../Mono.Addins.Database/AddinScanResult.cs        |  173 --
 .../Mono.Addins.Database/AddinScanner.cs           |  898 -----------
 .../Mono.Addins.Database/AddinUpdateData.cs        |  239 ---
 .../Mono.Addins.Database/DatabaseConfiguration.cs  |  133 --
 .../Mono.Addins.Database/FileDatabase.cs           |  437 ------
 .../Mono.Addins.Database/ProcessProgressStatus.cs  |  161 --
 .../Mono.Addins.Database/SetupProcess.cs           |  135 --
 .../Mono.Addins/Mono.Addins.Database/Util.cs       |  156 --
 .../Mono.Addins.Description/AddinDependency.cs     |  128 --
 .../Mono.Addins.Description/AddinDescription.cs    |  754 ---------
 .../Mono.Addins.Description/AssemblyDependency.cs  |  105 --
 .../ConditionTypeDescription.cs                    |  106 --
 .../ConditionTypeDescriptionCollection.cs          |   48 -
 .../Mono.Addins.Description/Dependency.cs          |   50 -
 .../DependencyCollection.cs                        |   58 -
 .../Mono.Addins.Description/Extension.cs           |  205 ---
 .../Mono.Addins.Description/ExtensionCollection.cs |   49 -
 .../ExtensionNodeDescription.cs                    |  243 ---
 .../ExtensionNodeDescriptionCollection.cs          |   62 -
 .../Mono.Addins.Description/ExtensionNodeSet.cs    |  325 ----
 .../ExtensionNodeSetCollection.cs                  |   58 -
 .../Mono.Addins.Description/ExtensionNodeType.cs   |  190 ---
 .../ExtensionNodeTypeCollection.cs                 |   58 -
 .../Mono.Addins.Description/ExtensionPoint.cs      |  234 ---
 .../ExtensionPointCollection.cs                    |   58 -
 .../Mono.Addins.Description/ModuleDescription.cs   |  273 ----
 .../ModuleDescriptionCollection.cs                 |   48 -
 .../Mono.Addins.Description/NativeDependency.cs    |   49 -
 .../Mono.Addins.Description/NodeTypeAttribute.cs   |  130 --
 .../NodeTypeAttributeCollection.cs                 |   48 -
 .../Mono.Addins.Description/ObjectDescription.cs   |  135 --
 .../ObjectDescriptionCollection.cs                 |  120 --
 .../Mono.Addins.Localization/GettextDomain.cs      |  140 --
 .../Mono.Addins.Localization/GettextLocalizer.cs   |   62 -
 .../Mono.Addins.Localization/IAddinLocalizer.cs    |   37 -
 .../IAddinLocalizerFactory.cs                      |   37 -
 .../IPluralAddinLocalizer.cs                       |   36 -
 .../Mono.Addins.Localization/NullLocalizer.cs      |   41 -
 .../StringResourceLocalizer.cs                     |   52 -
 .../StringTableLocalizer.cs                        |   95 --
 .../Mono.Addins.Serialization/BinaryXmlReader.cs   |  548 -------
 .../Mono.Addins.Serialization/BinaryXmlTypeMap.cs  |   77 -
 .../Mono.Addins.Serialization/BinaryXmlWriter.cs   |  223 ---
 .../Mono.Addins.Serialization/IBinaryXmlElement.cs |   39 -
 lib/mono-addins/Mono.Addins/Mono.Addins.dll.config |    6 -
 lib/mono-addins/Mono.Addins/Mono.Addins/Addin.cs   |  238 ---
 .../Mono.Addins/Mono.Addins/AddinAttribute.cs      |   77 -
 .../Mono.Addins/AddinDependencyAttribute.cs        |   55 -
 .../Mono.Addins/Mono.Addins/AddinErrorEventArgs.cs |   55 -
 .../Mono.Addins/Mono.Addins/AddinEventArgs.cs      |   49 -
 .../Mono.Addins/Mono.Addins/AddinInfo.cs           |  238 ---
 .../Mono.Addins/Mono.Addins/AddinLocalizer.cs      |   72 -
 .../Mono.Addins/Mono.Addins/AddinManager.cs        |  314 ----
 .../Mono.Addins/Mono.Addins/AddinRegistry.cs       |  305 ----
 .../Mono.Addins/Mono.Addins/AddinRootAttribute.cs  |   50 -
 .../Mono.Addins/Mono.Addins/AddinSessionService.cs |  394 -----
 .../Mono.Addins/Mono.Addins/ConditionType.cs       |  176 ---
 .../Mono.Addins/ConsoleProgressStatus.cs           |  107 --
 .../Mono.Addins/Mono.Addins/ExtensionAttribute.cs  |   77 -
 .../Mono.Addins/Mono.Addins/ExtensionContext.cs    |  799 ----------
 .../Mono.Addins/Mono.Addins/ExtensionNode.cs       |  316 ----
 .../Mono.Addins/ExtensionNodeAttribute.cs          |   65 -
 .../Mono.Addins/ExtensionNodeChildAttribute.cs     |   66 -
 .../Mono.Addins/Mono.Addins/ExtensionNodeList.cs   |   82 -
 .../Mono.Addins/ExtensionPointAttribute.cs         |   96 --
 .../Mono.Addins/Mono.Addins/ExtensionTree.cs       |  236 ---
 .../Mono.Addins/Mono.Addins/GettextCatalog.cs      |   47 -
 .../Mono.Addins/Mono.Addins/IAddinInstaller.cs     |   11 -
 .../Mono.Addins/Mono.Addins/IProgressStatus.cs     |   48 -
 .../Mono.Addins/InstanceExtensionNode.cs           |   63 -
 .../Mono.Addins/MissingDependencyException.cs      |   46 -
 .../Mono.Addins/NodeAttributeAttribute.cs          |  117 --
 .../Mono.Addins/Mono.Addins/NodeElement.cs         |   65 -
 .../Mono.Addins/Mono.Addins/RuntimeAddin.cs        |  350 -----
 .../Mono.Addins/Mono.Addins/TreeNode.cs            |  333 ----
 .../Mono.Addins/Mono.Addins/TreeNodeCollection.cs  |   84 -
 .../Mono.Addins/Mono.Addins/TypeExtensionNode.cs   |   60 -
 .../Mono.Addins/TypeExtensionPointAttribute.cs     |   77 -
 src/Makefile.am                                    |    6 +-
 tests/src/Makefile.am                              |   14 +-
 161 files changed, 19 insertions(+), 26060 deletions(-)
---
diff --git a/Makefile.addins b/Makefile.addins
index ee7973b..bcf3727 100644
--- a/Makefile.addins
+++ b/Makefile.addins
@@ -5,7 +5,10 @@ include $(top_srcdir)/Makefile.include
 dep_resources = $(addprefix $(srcdir)/, $(addin_resources))
 build_resources = $(foreach res, $(dep_resources), $(addprefix -resource:, $(res)),$(notdir $(res)))
 build_sources = $(addprefix $(srcdir)/, $(addin_sources))
-build_packages = $(addprefix -pkg:, $(addin_packages))
+build_packages = 					\
+	$(addprefix -pkg:, $(addin_packages))		\
+	-pkg:mono-addins
+
 build_references =					\
 	$(addprefix -r:, $(addin_references))		\
 	-r:$(top_builddir)/src/f-spot.exe		\
@@ -16,7 +19,6 @@ build_references =					\
 	-r:$(top_builddir)/src/FSpot.Utils.dll		\
 	-r:$(top_builddir)/src/FSpot.Widgets.dll	\
 	$(LINK_SEMWEB)					\
-	$(LINK_MONO_ADDINS)				\
 	$(LINK_GPHOTO2)					\
 	$(LINK_GIOSHARP)				\
 	$(LINK_UNIQUESHARP)				\
diff --git a/Makefile.include b/Makefile.include
index e41ff8f..4e0ec9a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,9 +3,6 @@
 
 ## Directories
 
-DIR_ADDINS_ADDINS = $(top_builddir)/lib/mono-addins/Mono.Addins
-DIR_ADDINS_GUI = $(top_builddir)/lib/mono-addins/Mono.Addins.Gui
-DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
@@ -23,10 +20,6 @@ DIR_UNIQUESHARP = $(top_builddir)/lib/unique-sharp/unique
 
 LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
 LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
-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
 LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
 LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
diff --git a/configure.ac b/configure.ac
index 75acfd6..f465d1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,11 +91,11 @@ NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
 CAIRO_REQUIRED=1.4.0
-dnl -- this check is 	
 LCMS_REQUIRED=1.12
 LIBGPHOTO2_REQUIRED=2.4
+MONOADDINS_REQUIRED=0.3
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED mono-addins >= $MONOADDINS_REQUIRED mono-addins-gui >= $MONOADDINS_REQUIRED mono-addins-setup >= $MONOADDINS_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
@@ -305,10 +305,6 @@ lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
 lib/libgphoto2-sharp/glue/Makefile
 lib/libjpegtran/Makefile
 lib/Makefile
-lib/mono-addins/Makefile
-lib/mono-addins/Mono.Addins.Gui/Makefile
-lib/mono-addins/Mono.Addins/Makefile
-lib/mono-addins/Mono.Addins.Setup/Makefile
 lib/semweb/Makefile
 lib/unique-sharp/Makefile
 lib/unique-sharp/generator/Makefile
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index a9aa972..16786b8 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -38,7 +38,6 @@ REFS =							\
 	-r:$(top_builddir)/src/FSpot.Widgets.dll	\
 	$(LINK_GTKSHARPBEANS)				\
 	$(LINK_KEYRING)                     		\
-	$(LINK_MONO_ADDINS)				\
 	$(LINK_SEMWEB)					\
 	$(LINK_GPHOTO2)					\
 	$(LINK_GIOSHARP)				\
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index ec40c02..e75a9f8 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -15,7 +15,6 @@ REFS =						\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GTKSHARPBEANS)			\
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 9a51e13..6d16ba8 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -14,7 +14,6 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index ee31a30..a09a0d0 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -15,7 +15,6 @@ REFS =						\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GTKSHARPBEANS)			\
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index e28fcb3..b5bfd9f 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -16,7 +16,6 @@ REFS =						\
 	$(LINK_SEMWEB)				\
 	-r:google-sharp/Mono.Google.dll		\
 	$(LINK_KEYRING)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_UNIQUESHARP)			\
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 6537aae..166de02 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -15,7 +15,6 @@ REFS =						\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	-r:SmugMugNet/SmugMugNet.dll		\
 	$(LINK_SEMWEB)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GTKSHARPBEANS)			\
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index abce7f5..056be8d 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -30,7 +30,6 @@ REFS = \
 	-r:$(top_builddir)/src/FSpot.Utils.dll \
 	-r:Tabblo/Mono.Tabblo.dll \
 	$(LINK_KEYRING)		\
-	$(LINK_MONO_ADDINS)	\
 	$(LINK_SEMWEB)		\
 	$(LINK_GIOSHARP)	\
 	$(LINK_GTKSHARPBEANS)	\	
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index 7149e14..52b0378 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -14,7 +14,6 @@ REFS =						\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_GIOSHARP)			\
@@ -25,7 +24,8 @@ REFS =						\
 
 PKGS =					\
 	-pkg:gtk-sharp-2.0		\
-	-pkg:glade-sharp-2.0
+	-pkg:glade-sharp-2.0		\
+	-pkg:mono-addins
 
 RESOURCES =				\
 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index df912a7..a4c9d3e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,6 @@ UNCONDITIONAL_SUBDIRS = \
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
-	mono-addins			\
 	semweb				\
 	unique-sharp
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c107224..201b323 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -353,10 +353,10 @@ BLING_ASSEMBLIES =				\
 	$(LINK_GTKSHARPBEANS)
 
 WIDGETS_ASSEMBLIES =				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
 	-pkg:gtk-sharp-2.0			\
 	-pkg:gnome-sharp-2.0			\
+	-pkg:mono-addins			\
 	$(LINK_GTKSHARPBEANS)			\
 	-r:Mono.Cairo				\
 	-r:Cms.dll				\
@@ -378,7 +378,6 @@ NULL_PLATFORM_ASSEMBLIES =			\
 
 F_SPOT_ASSEMBLIES = 				\
 	$(LINK_GPHOTO2)				\
-	$(LINK_MONO_ADDINS)			\
 	$(LINK_FLICKR)				\
 	$(LINK_KEYRING)				\
 	$(LINK_SMUGMUG)				\
@@ -405,6 +404,9 @@ F_SPOT_ASSEMBLIES = 				\
 	$(NDESK_DBUS_LIBS)				\
 	$(GCONF_PKG)				\
 	$(GTKHTML_SHARP_PKG)			\
+	-pkg:mono-addins			\
+	-pkg:mono-addins-setup			\
+	-pkg:mono-addins-gui			\
 	-pkg:glade-sharp-2.0			\
 	-pkg:gnome-sharp-2.0			\
 	-pkg:gnome-vfs-sharp-2.0
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 68d4b40..7c6e600 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -21,14 +21,14 @@ PKGS = 					\
 	-pkg:gnome-sharp-2.0		\
 	-pkg:gtk-sharp-2.0
 
-REFS =										\
-	$(LINK_GPHOTO2)							\
-	$(LINK_MONO_ADDINS)						\
-	$(LINK_GIOSHARP)						\
-	-r:$(top_builddir)/src/f-spot.exe			\
+REFS =							\
+	$(LINK_GPHOTO2)					\
+	$(LINK_GIOSHARP)				\
+	$(LINK_UNIQUESHARP)				\
+	-r:$(top_builddir)/src/f-spot.exe		\
 	-r:$(top_builddir)/src/FSpot.Core.dll		\
-	-r:$(top_builddir)/src/FSpot.Query.dll	\
-	-r:$(top_builddir)/src/FSpot.Utils.dll	\
+	-r:$(top_builddir)/src/FSpot.Query.dll		\
+	-r:$(top_builddir)/src/FSpot.Utils.dll		\
 	-r:$(top_builddir)/src/FSpot.Platform.dll	\
 	-r:$(top_builddir)/src/Cms.dll			\
 	-r:$(top_builddir)/lib/semweb/SemWeb.dll
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]