[f-spot] fix Makefiles for DBusService and BeagleService

[Stephane Delcroix <sdelcroix src gnome org>]

commit c833c17b014b01fe86348dd802a926ffd28d1f02
Author: Stephane Delcroix <stephane delcroix org>
Date:   Wed Oct 7 17:35:00 2009 +0200

    fix Makefiles for DBusService and BeagleService

 Makefile.addins                               |    1 +
 extensions/Services/BeagleService/Makefile.am |   56 +++++------------------
 extensions/Services/DBusService/Makefile.am   |   59 ++++++-------------------
 3 files changed, 27 insertions(+), 89 deletions(-)
---
diff --git a/Makefile.addins b/Makefile.addins
index 6ccb1f5..aabac07 100644
--- a/Makefile.addins
+++ b/Makefile.addins
@@ -12,6 +12,7 @@ build_references =				\
 	-r:$(top_builddir)/src/Cms.dll		\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
+	-r:$(top_builddir)/src/FSpot.Query.dll	\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
diff --git a/extensions/Services/BeagleService/Makefile.am b/extensions/Services/BeagleService/Makefile.am
index 648c945..0aee184 100644
--- a/extensions/Services/BeagleService/Makefile.am
+++ b/extensions/Services/BeagleService/Makefile.am
@@ -1,49 +1,17 @@
-include $(top_srcdir)/Makefile.include
+addin = BeagleService
 
-PLUGIN_NAME = BeagleService
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs		\
+	BeagleNotifier.cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/BeagleService.cs	\
-	$(srcdir)/BeagleNotifier.cs
+addin_references =
+addin_packages =
+addin_extraflags =
+addin_extradist =
 
-
-REFS =					\
-	-r:$(top_builddir)/src/f-spot.exe		\
-	-r:$(top_builddir)/src/FSpot.Core.dll	\
-	-r:$(top_builddir)/src/FSpot.Utils.dll	\
-	$(LINK_MONO_ADDINS)			\
-	$(LINK_SEMWEB)				\
-	$(LINK_GPHOTO2)				\
-	$(LINK_GIOSHARP)			\
-	$(LINK_BEAGLE)
-
-PKGS =
-
-RESOURCES =				\
-	-resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_MANIFEST)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Services/DBusService/Makefile.am b/extensions/Services/DBusService/Makefile.am
index b1485ae..cd633c9 100644
--- a/extensions/Services/DBusService/Makefile.am
+++ b/extensions/Services/DBusService/Makefile.am
@@ -1,51 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = DBusService
 
-PLUGIN_NAME = DBusService
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs		\
+	DBusProxy.cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/DBusService.cs	\
-	$(srcdir)/DBusProxy.cs
+addin_references =
+addin_packages =		\
+	gtk-sharp-2.0
 
+addin_extraflags =		\
+	$(NDESK_DBUS_LIBS)
+addin_extradist =
 
-REFS =					\
-	-pkg:gtk-sharp-2.0		\
-	-r:$(top_builddir)/src/f-spot.exe		\
-	-r:$(top_builddir)/src/FSpot.Core.dll	\
-	-r:$(top_builddir)/src/FSpot.Utils.dll	\
-	-r:$(top_builddir)/src/FSpot.Query.dll	\
-	$(NDESK_DBUS_LIBS)				\
-	$(LINK_MONO_ADDINS)			\
-	$(LINK_SEMWEB)				\
-	$(LINK_GIOSHARP)				\
-	$(LINK_GPHOTO2)
-
-PKGS =
-
-RESOURCES =				\
-	-resource:$(srcdir)/$(PLUGIN_MANIFEST)
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(CSC_DEFINES) $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_MANIFEST)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+include $(top_srcdir)/Makefile.addins