Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

2009-03-16 Mike Kestner <mkestner@novell.com>

	* Makefile.include: parallel make fix.
	* gconf/GConf/Makefile.am: parallel make fix.
	* gconf/GConf.PropertyEditors/Makefile.am: parallel make fix.
	Patch from Peter Alfredsen.  [Fixes #483251]

svn path=/trunk/gnome-sharp/; revision=129503
  • Loading branch information...
commit c31087862d7e3d1ce827c30ea95e8759f07b7314 1 parent d940edb
@mkestner mkestner authored
View
7 ChangeLog
@@ -1,3 +1,10 @@
+2009-03-16 Mike Kestner <mkestner@novell.com>
+
+ * Makefile.include: parallel make fix.
+ * gconf/GConf/Makefile.am: parallel make fix.
+ * gconf/GConf.PropertyEditors/Makefile.am: parallel make fix.
+ Patch from Peter Alfredsen. [Fixes #483251]
+
2009-03-03 Mike Kestner <mkestner@novell.com>
* bootstrap-2.24: bump version to 2.24.1 and tag.
View
11 Makefile.include
@@ -46,12 +46,11 @@ $(SNK): $(top_srcdir)/$(SNK)
AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
cp $(top_builddir)/AssemblyInfo.cs .
-$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
- @for i in $(POLICY_VERSIONS); do \
- echo "Creating policy.$$i.$(ASSEMBLY)"; \
- sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config; \
- $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK); \
- done
+policy.%.config: $(top_builddir)/policy.config
+ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
+
+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
+ $(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
build_sources = $(patsubst %, $(srcdir)/%, $(sources)) AssemblyInfo.cs
build_references = $(GTKSHARP_LIBS) $(patsubst %, /r:%, $(references)) $(MONO_CAIRO_LIBS)
View
11 gconf/GConf.PropertyEditors/Makefile.am
@@ -53,12 +53,11 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk
$(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)
$(GAPI_CDECL_INSERT)
-$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
- @for i in $(POLICY_VERSIONS); do \
- echo "Creating policy.$$i.$(ASSEMBLY)"; \
- sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config; \
- $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk; \
- done
+policy.%.config: $(top_builddir)/policy.config
+ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
+
+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
+ $(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
install-data-local:
@if test -n '$(TARGET)'; then \
View
11 gconf/GConf/Makefile.am
@@ -49,12 +49,11 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
$(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) AssemblyInfo.cs
$(GAPI_CDECL_INSERT)
-$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
- @for i in $(POLICY_VERSIONS); do \
- echo "Creating policy.$$i.$(ASSEMBLY)"; \
- sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config; \
- $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk; \
- done
+policy.%.config: $(top_builddir)/policy.config
+ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
+
+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
+ $(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
install-data-local:
@if test -n '$(TARGET)'; then \
Please sign in to comment.
Something went wrong with that request. Please try again.