diff --git a/ChangeLog b/ChangeLog index 319bb7888..87f5896e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-26 Mike Kestner + + * bootstrap-2.12: bump svn version. + * cairo/Makefile.am: policy config is hard-coded, not generated. + 2008-11-26 Mike Kestner * configure.in.in: prepend CFLAGS environment setting to AC_SUBST. diff --git a/bootstrap-2.12 b/bootstrap-2.12 index 93b347e07..d4146474d 100755 --- a/bootstrap-2.12 +++ b/bootstrap-2.12 @@ -1,7 +1,7 @@ #!/bin/sh # Run this to set configure.in up for an API version. -GTK_SHARP_VERSION=2.12.6 +GTK_SHARP_VERSION=2.12.7 ASSEMBLY_VERSION=2.12.0.0 POLICY_VERSIONS="2.4 2.6 2.8 2.10" GTK_REQUIRED_VERSION=2.12.0 diff --git a/cairo/Makefile.am b/cairo/Makefile.am index 687a1ce0a..6c9e63780 100644 --- a/cairo/Makefile.am +++ b/cairo/Makefile.am @@ -11,7 +11,7 @@ endif noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLY) $(POLICY_CONFIG) gtk-sharp.snk AssemblyInfo.cs +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLY) gtk-sharp.snk AssemblyInfo.cs sources = \ Antialias.cs \ @@ -76,11 +76,7 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs @rm -f $(ASSEMBLY).mdb $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources) -$(POLICY_CONFIG): $(top_builddir)/policy.config - @echo "sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@API_VERSION@/2.0.0.0/" -e "s/@POLICY@.0/1.0.5000/" $(top_builddir)/policy.config > $@" - @sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@API_VERSION@/2.0.0.0/" -e "s/@POLICY@.0/1.0.5000/" $(top_builddir)/policy.config > $@ - -$(POLICY_ASSEMBLY): $(POLICY_CONFIG) gtk-sharp.snk +$(POLICY_ASSEMBLY): $(srcdir)/$(POLICY_CONFIG) gtk-sharp.snk echo "Creating policy.1.0.$(ASSEMBLY)"; $(AL) -link:$(POLICY_CONFIG) -out:$@ -keyfile:gtk-sharp.snk; @@ -100,5 +96,5 @@ uninstall-local: $(GACUTIL) /u policy.1.0.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi -EXTRA_DIST = $(sources) +EXTRA_DIST = $(sources) $(POLICY_CONFIG)