2009-01-23 Mike Kestner <mkestner@novell.com>

* Makefile.include:
	* doc/Makefile.am:
	* glib/Makefile.am:
	* gtkdotnet/Makefile.am: parallel make patches from Diego Pettenò  
	and Bertrand Lorentz. [Fixes #421063]

svn path=/trunk/gtk-sharp/; revision=124400
This commit is contained in:
Mike Kestner 2009-01-24 04:47:54 +00:00
parent abc3237425
commit 27c413091c
5 changed files with 26 additions and 19 deletions

View file

@ -1,3 +1,11 @@
2009-01-23 Mike Kestner <mkestner@novell.com>
* Makefile.include:
* doc/Makefile.am:
* glib/Makefile.am:
* gtkdotnet/Makefile.am: parallel make patches from Diego Pettenò
and Bertrand Lorentz. [Fixes #421063]
2009-01-13 Brad Taylor <brad@getcoded.net>
* atk/Atk.metadata: Bind GetRunAttributes and GetDefaultAttributes as

View file

@ -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 = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)

View file

@ -31,7 +31,9 @@ monodoc_DATA=$(TARGETS)
assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
gtk-sharp-docs.tree: gtk-sharp-docs.zip
gtk-sharp-docs.zip: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
$(MDOC) assemble -o gtk-sharp-docs $(srcdir)/en
get-assemblies:

View file

@ -102,12 +102,11 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
$(CSC) $(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -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 file

@ -45,12 +45,11 @@ $(ASSEMBLY): $(build_sources) $(references) gtk-sharp.snk AssemblyInfo.cs
$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_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 \