[f-spot] standardize the Makefiles

From: Stephane Delcroix <sdelcroix src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [f-spot] standardize the Makefiles
Date: Thu, 17 Sep 2009 14:55:53 +0000 (UTC)
commit 4481c4f174e4d8cc04f945411ecc642bae3c107d
Author: Stephane Delcroix <stephane delcroix org>
Date:   Thu Sep 17 16:54:29 2009 +0200

    standardize the Makefiles

 Makefile.addins                               |   37 ++++++++++++++
 Makefile.am                                   |    1 +
 extensions/Editors/.gitignore                 |    1 +
 extensions/Editors/BWEditor/.gitignore        |    3 -
 extensions/Editors/BWEditor/Makefile.am       |   63 ++++++-------------------
 extensions/Editors/BlackoutEditor/.gitignore  |    3 -
 extensions/Editors/BlackoutEditor/Makefile.am |   59 +++++------------------
 extensions/Editors/FlipEditor/.gitignore      |    3 -
 extensions/Editors/FlipEditor/Makefile.am     |   59 +++++------------------
 extensions/Editors/PixelateEditor/.gitignore  |    3 -
 extensions/Editors/PixelateEditor/Makefile.am |   59 +++++------------------
 extensions/Editors/ResizeEditor/.gitignore    |    1 -
 extensions/Editors/ResizeEditor/Makefile.am   |   59 +++++------------------
 13 files changed, 105 insertions(+), 246 deletions(-)
---
diff --git a/Makefile.addins b/Makefile.addins
new file mode 100644
index 0000000..f0c1b4c
--- /dev/null
+++ b/Makefile.addins
@@ -0,0 +1,37 @@
+ASSEMBLY = $(addin).dll
+
+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_references =				\
+	$(addprefix -r:, $(addin_references))	\
+	-r:$(top_builddir)/src/f-spot.exe	\
+	-r:$(top_builddir)/src/Cms.dll		\
+	-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)
+
+
+all: $(ASSEMBLY)
+mpack: $(ASSEMBLY)
+	mautil p $(ASSEMBLY)
+
+$(ASSEMBLY): $(build_sources) $(dep_resource)
+	$(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
+
+addindir = $(pkglibdir)/extensions
+addin_DATA = $(ASSEMBLY)
+
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb *.mpack
+
+ETRA_DIST = 			\
+	$(build_sources)	\
+	$(dep_resources)	\
+	$(addin_extradist)
diff --git a/Makefile.am b/Makefile.am
index e556ecc..8ad05dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST =			\
 	f-spot.pc.in		\
 	f-spot.spec		\
 	Makefile.include	\
+	Makefile.addins		\
 	gnome-doc-utils.make	\
 	icon-theme-installer	\
         $(desktop_in_files)     \
diff --git a/extensions/Editors/.gitignore b/extensions/Editors/.gitignore
index 282522d..ec10c1c 100644
--- a/extensions/Editors/.gitignore
+++ b/extensions/Editors/.gitignore
@@ -1,2 +1,3 @@
 Makefile
 Makefile.in
+*Editor.dll
diff --git a/extensions/Editors/BWEditor/Makefile.am b/extensions/Editors/BWEditor/Makefile.am
index 1fbc961..744de85 100644
--- a/extensions/Editors/BWEditor/Makefile.am
+++ b/extensions/Editors/BWEditor/Makefile.am
@@ -1,56 +1,21 @@
-include $(top_srcdir)/Makefile.include
+addin = BWEditor
 
-PLUGIN_NAME = BWEditor
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/$(PLUGIN_NAME).cs
+addin_references =		\
+	Mono.Posix		\
+	Mono.Simd
 
-REFS =					\
-	-r:$(top_builddir)/src/f-spot.exe	\
-	-r:$(top_builddir)/src/Cms.dll		\
-	-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)			\
-	-r:Mono.Simd				\
-	-r:Mono.Posix
+addin_packages =		\	
+	gtk-sharp-2.0
 
-PKGS =					\
-	-pkg:gtk-sharp-2.0
-
-CSC_FLAGS += -unsafe
-
-PLUGIN_RESOURCES =				\
-	$(srcdir)/$(PLUGIN_MANIFEST)
-
-RESOURCES = $(foreach res, $(PLUGIN_RESOURCES), $(addprefix -resource:, $(res)),$(notdir $(res)))
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_RESOURCES)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+addin_extraflags = -unsafe
+addin_extradist =
 
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/BlackoutEditor/Makefile.am b/extensions/Editors/BlackoutEditor/Makefile.am
index 7aa80bc..a200b81 100644
--- a/extensions/Editors/BlackoutEditor/Makefile.am
+++ b/extensions/Editors/BlackoutEditor/Makefile.am
@@ -1,53 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = BlackoutEditor
 
-PLUGIN_NAME = BlackoutEditor
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/$(PLUGIN_NAME).cs
+addin_references =		\
+	Mono.Posix
 
-REFS =					\
-	-r:$(top_builddir)/src/f-spot.exe	\
-	-r:$(top_builddir)/src/Cms.dll		\
-	-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)			\
-	-r:Mono.Posix
+addin_packages =		\	
+	gtk-sharp-2.0
 
-PKGS =					\
-	-pkg:gtk-sharp-2.0
-
-PLUGIN_RESOURCES =				\
-	$(srcdir)/$(PLUGIN_MANIFEST)
-
-RESOURCES = $(foreach res, $(PLUGIN_RESOURCES), $(addprefix -resource:, $(res)),$(notdir $(res)))
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_RESOURCES)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+addin_extraflags =
+addin_extradist =
 
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/FlipEditor/Makefile.am b/extensions/Editors/FlipEditor/Makefile.am
index d22491d..e8dae23 100644
--- a/extensions/Editors/FlipEditor/Makefile.am
+++ b/extensions/Editors/FlipEditor/Makefile.am
@@ -1,53 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = FlipEditor
 
-PLUGIN_NAME = FlipEditor
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/$(PLUGIN_NAME).cs
+addin_references =		\
+	Mono.Posix
 
-REFS =					\
-	-r:$(top_builddir)/src/f-spot.exe	\
-	-r:$(top_builddir)/src/Cms.dll		\
-	-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)			\
-	-r:Mono.Posix
+addin_packages =		\	
+	gtk-sharp-2.0
 
-PKGS =					\
-	-pkg:gtk-sharp-2.0
-
-PLUGIN_RESOURCES =				\
-	$(srcdir)/$(PLUGIN_MANIFEST)
-
-RESOURCES = $(foreach res, $(PLUGIN_RESOURCES), $(addprefix -resource:, $(res)),$(notdir $(res)))
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_RESOURCES)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+addin_extraflags =
+addin_extradist =
 
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/PixelateEditor/Makefile.am b/extensions/Editors/PixelateEditor/Makefile.am
index f3583c4..c91ff68 100644
--- a/extensions/Editors/PixelateEditor/Makefile.am
+++ b/extensions/Editors/PixelateEditor/Makefile.am
@@ -1,53 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = PixelateEditor
 
-PLUGIN_NAME = PixelateEditor
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/$(PLUGIN_NAME).cs
+addin_references =		\
+	Mono.Posix
 
-REFS =					\
-	-r:$(top_builddir)/src/f-spot.exe	\
-	-r:$(top_builddir)/src/Cms.dll		\
-	-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)			\
-	-r:Mono.Posix
+addin_packages =		\	
+	gtk-sharp-2.0
 
-PKGS =					\
-	-pkg:gtk-sharp-2.0
-
-PLUGIN_RESOURCES =				\
-	$(srcdir)/$(PLUGIN_MANIFEST)
-
-RESOURCES = $(foreach res, $(PLUGIN_RESOURCES), $(addprefix -resource:, $(res)),$(notdir $(res)))
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_RESOURCES)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+addin_extraflags =
+addin_extradist =
 
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Editors/ResizeEditor/Makefile.am b/extensions/Editors/ResizeEditor/Makefile.am
index ffafd7e..cb77879 100644
--- a/extensions/Editors/ResizeEditor/Makefile.am
+++ b/extensions/Editors/ResizeEditor/Makefile.am
@@ -1,53 +1,20 @@
-include $(top_srcdir)/Makefile.include
+addin = ResizeEditor
 
-PLUGIN_NAME = ResizeEditor
+addin_manifest = $(addin).addin.xml
 
-PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+addin_sources =			\
+	$(addin).cs
 
-PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+addin_resources =		\
+	$(addin_manifest)
 
-PLUGIN_SOURCES =			\
-	$(srcdir)/$(PLUGIN_NAME).cs
+addin_references =		\
+	Mono.Posix
 
-REFS =					\
-	-r:$(top_builddir)/src/f-spot.exe	\
-	-r:$(top_builddir)/src/Cms.dll		\
-	-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)			\
-	-r:Mono.Posix
+addin_packages =		\	
+	gtk-sharp-2.0
 
-PKGS =					\
-	-pkg:gtk-sharp-2.0
-
-PLUGIN_RESOURCES =				\
-	$(srcdir)/$(PLUGIN_MANIFEST)
-
-RESOURCES = $(foreach res, $(PLUGIN_RESOURCES), $(addprefix -resource:, $(res)),$(notdir $(res)))
-
-all: $(PLUGIN_ASSEMBLY)
-
-mpack: $(PLUGIN_ASSEMBLY)
-	mautil p $(PLUGIN_ASSEMBLY)
-
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
-	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-
-plugindir = $(pkglibdir)/extensions
-
-plugin_DATA =			\
-	$(PLUGIN_ASSEMBLY)
-
-EXTRA_DIST = 			\
-	$(PLUGIN_SOURCES)	\
-	$(PLUGIN_RESOURCES)
-
-CLEANFILES =			\
-	$(PLUGIN_ASSEMBLY)	\
-	$(PLUGIN_ASSEMBLY).mdb	\
-	*.mpack
+addin_extraflags =
+addin_extradist =
 
+include $(top_srcdir)/Makefile.addins
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]