f-spot r3629 - in trunk: . extensions/DevelopInUFraw extensions/RawPlusJpeg src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Feb  6 08:21:26 2008
New Revision: 3629
URL: http://svn.gnome.org/viewvc/f-spot?rev=3629&view=rev

Log:
fixing the .pc, bumping some addin versions

Modified:
   trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml
   trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml
   trunk/f-spot.pc.in
   trunk/src/Makefile.am

Modified: trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml
==============================================================================
--- trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml	(original)
+++ trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml	Wed Feb  6 08:21:26 2008
@@ -1,6 +1,6 @@
 <Addin namespace="FSpot"
 	id="DevelopInUFraw"
-	version="0.98"
+	version="0.99"
 	description="Develop the image in UFRaw, saves the result as a new version\n\nNote: Require ufraw 0.13 or CVS version newer than 2007-09-06 !!!"
 	author="Stephane Delcroix"
 	url="http://f-spot.org/Extensions";

Modified: trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml
==============================================================================
--- trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml	(original)
+++ trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml	Wed Feb  6 08:21:26 2008
@@ -1,6 +1,6 @@
 <Addin namespace="FSpot"
 	id="RawPlusJpeg"
-	version="1.04"
+	version="1.05"
 	description="Merge RAW+Jpeg as multiple versions of the same photo"
 	author="Stephane Delcroix"
 	url="http://f-spot.org/Extensions";

Modified: trunk/f-spot.pc.in
==============================================================================
--- trunk/f-spot.pc.in	(original)
+++ trunk/f-spot.pc.in	Wed Feb  6 08:21:26 2008
@@ -6,4 +6,4 @@
 Name: F-Spot
 Description: F-Spot, Organise, enjoy and share your pictures
 Version: @VERSION@
-Libs: -r:${libdir}/f-spot/f-spot.exe -r:${libdir}/f-spot/FSpot.Core.dll -r:${libdir}/f-spot/FSpot.Utils.dll -r:${libdir}/f-spot/Cms.dll -r:${libdir}/f-spot/Query.dll
+Libs: -r:${libdir}/f-spot/f-spot.exe -r:${libdir}/f-spot/FSpot.Core.dll -r:${libdir}/f-spot/FSpot.Utils.dll -r:${libdir}/f-spot/Cms.dll -r:${libdir}/f-spot/FSpot.Query.dll

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Feb  6 08:21:26 2008
@@ -322,15 +322,20 @@
 	-pkg:glade-sharp-2.0			\
 	-pkg:gnome-vfs-sharp-2.0
 
-RESOURCES =										\
-	-resource:$(top_srcdir)/icons/f-spot-simple-white.css,f-spot-simple-white.css	\
-	-resource:$(top_srcdir)/icons/f-spot-simple.css,f-spot-simple.css		\
-	-resource:$(top_srcdir)/icons/f-spot.js,f-spot.js				\
-	-resource:$(top_srcdir)/icons/f-spot-not.png,f-spot-not.png			\
-	-resource:$(top_srcdir)/icons/f-spot-logo.svg,f-spot-logo.svg			\
-	-resource:$(srcdir)/dces.rdf,dces.rdf						\
-	-resource:$(srcdir)/f-spot.glade,f-spot.glade					\
-	-resource:$(srcdir)/FSpot.addin.xml,FSpot.addin.xml
+F_SPOT_DISTRESOURCES =			\
+	$(srcdir)/dces.rdf		\
+	$(srcdir)/f-spot.glade		\
+	$(srcdir)/FSpot.addin.xml
+
+F_SPOT_RESOURCES =					\
+	$(F_SPOT_DISTRESOURCES)
+	$(top_srcdir)/icons/f-spot-simple-white.css	\
+	$(top_srcdir)/icons/f-spot-simple.css		\
+	$(top_srcdir)/icons/f-spot.js			\
+	$(top_srcdir)/icons/f-spot-not.png		\
+	$(top_srcdir)/icons/f-spot-logo.svg
+
+RESOURCES = $(foreach res,$(F_SPOT_RESOURCES), $(addprefix -resource:,$(res)),$(notdir $(res)))
 
 fspotlibdir = $(libdir)/f-spot
 fspotlib_DATA = f-spot.exe.config	\
@@ -371,7 +376,7 @@
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(UTILS_CSFILES) $(UTILS_ASSEMBLIES)
 
-f-spot.exe: $(F_SPOT_CSFILES) f-spot.glade dces.rdf FSpot.addin.xml FSpot.Utils.dll FSpot.Core.dll FSpot.Query.dll Cms.dll
+f-spot.exe: $(F_SPOT_CSFILES) FSpot.Utils.dll FSpot.Core.dll FSpot.Query.dll Cms.dll $(F_SPOT_RESOURCES)
 	@echo -e "\n*** Compiling $@"
 	$(CSC) -target:winexe -out:$@ $(EXTRAFLAGS) $(F_SPOT_CSFILES) $(F_SPOT_ASSEMBLIES) $(RESOURCES)
 
@@ -383,13 +388,10 @@
 	$(CORE_CSDISTFILES)			\
 	$(QUERY_CSDISTFILES)			\
 	$(F_SPOT_CSDISTFILES)			\
-	dces.rdf				\
+	$(F_SPOT_DISTRESOURCES)			\
 	f-spot.exe.config.in			\
-	f-spot.glade				\
 	f-spot.in				\
-	Cms.dll.config				\
-	FSpot.addin.xml
-
+	Cms.dll.config
 
 CLEANFILES =					\
 	f-spot.exe.config			\