f-spot r4024 - in trunk: . extensions extensions/BeagleService src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Fri May 30 13:50:37 2008
New Revision: 4024
URL: http://svn.gnome.org/viewvc/f-spot?rev=4024&view=rev

Log:
the missing auto-fu for BeagleService

Added:
   trunk/extensions/BeagleService/Makefile.am
Removed:
   trunk/extensions/BeagleService/Makefile
Modified:
   trunk/configure.in
   trunk/extensions/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May 30 13:50:37 2008
@@ -144,22 +144,22 @@
   fi
 fi
 
-AC_SUBST(CSC_DEFINES)
 
 PKG_CHECK_MODULES(BEAGLE, beagle-0.0 >= $BEAGLE_REQUIRED,
 [
 	dnl this is a work around to avoid linking against beagles Util.dll
 	BEAGLE_DIR=`$PKG_CONFIG --variable=dlldir beagle-0.0`	
 	LINK_BEAGLE="-r:$BEAGLE_DIR/Beagle"
-	BEAGLE_DEFINES='-d:ENABLE_BEAGLE'
+	CSC_DEFINES="$CSC_DEFINES -d:ENABLE_BEAGLE"
 ],
 [
 	AC_MSG_RESULT([beagle not found])
 ])
 AC_SUBST(BEAGLE_DIR)
-AC_SUBST(BEAGLE_DEFINES)
 AC_SUBST(LINK_BEAGLE)
 
+AC_SUBST(CSC_DEFINES)
+
 dnl -- dbus-sharp: link or bundle ?
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 [
@@ -354,6 +354,7 @@
 Tao/Tao.GlPostProcess/Makefile
 Tao/Tao.OpenGl.ExtensionLoader/Makefile
 extensions/Makefile
+extensions/BeagleService/Makefile
 extensions/CDExport/Makefile
 extensions/DefaultExporters/Makefile
 extensions/FlickrExport/Makefile

Added: trunk/extensions/BeagleService/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/extensions/BeagleService/Makefile.am	Fri May 30 13:50:37 2008
@@ -0,0 +1,46 @@
+include $(top_srcdir)/Makefile.include
+
+PLUGIN_NAME = BeagleService
+
+PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+
+PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+
+PLUGIN_SOURCES =			\
+	$(srcdir)/BeagleService.cs	\
+	$(srcdir)/BeagleNotifier.cs
+
+
+REFS =					\
+	-r:../../src/f-spot.exe		\
+	-r:../../src/FSpot.Core.dll	\
+	-r:../../src/FSpot.Utils.dll	\
+	$(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)	\
+	$(PLUGIN_NAME).glade
+
+CLEANFILES =			\
+	$(PLUGIN_ASSEMBLY)	\
+	$(PLUGIN_ASSEMBLY).mdb	\
+	*.mpack

Modified: trunk/extensions/Makefile.am
==============================================================================
--- trunk/extensions/Makefile.am	(original)
+++ trunk/extensions/Makefile.am	Fri May 30 13:50:37 2008
@@ -1,4 +1,5 @@
 SUBDIRS = 			\
+	BeagleService		\
 	CDExport		\
 	GalleryExport		\
 	FlickrExport		\

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri May 30 13:50:37 2008
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.include
 UNSAFE = -unsafe
 NOWARN = -nowarn:0169 -nowarn:0612 -nowarn:0414  
-EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
+EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(CSC_DEFINES)
 
 CMS_CSDISTFILES =				\
 	$(srcdir)/Cms/CctTable.cs		\
@@ -300,7 +300,6 @@
 	$(LINK_SMUGMUG)				\
 	$(LINK_TAO)				\
 	$(LINK_SEMWEB)				\
-	$(LINK_BEAGLE)				\
 	-r:System.Data				\
 	-r:System.Web				\
 	-r:Mono.Data.SqliteClient		\