diff --git a/Makefile.include b/Makefile.include index 1d26ab7ec..c43dbe12e 100644 --- a/Makefile.include +++ b/Makefile.include @@ -49,12 +49,12 @@ policy.%.config: $(top_builddir)/policy.config $(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK) $(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK) -build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) build_references = $(addprefix -r:, $(references)) $(MONO_CAIRO_LIBS) $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references) @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources) + $(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources) $(top_builddir)$(ASSEMBLYINFO) install-data-local: @if test -n '$(pkg)'; then \ diff --git a/configure.ac b/configure.ac index ffe6b4697..5f6963ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,7 @@ fi if test "x$has_mono" = "xtrue"; then GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib' GENERATED_SOURCES=generated/*.cs +ASSEMBLYINFO=/AssemblyInfo.cs AC_PATH_PROG(RUNTIME, mono, no) # libmono and glib required for gui-thread-check profiler module @@ -143,6 +144,7 @@ AC_PATH_PROG(CSC, csc.exe, no) CSFLAGS="-nologo -platform:x86" GACUTIL_FLAGS= GENERATED_SOURCES=generated\\\\*.cs +ASSEMBLYINFO=\\\\AssemblyInfo.cs AM_CONDITIONAL(ENABLE_THREADCHECK, false) enable_dotnet=yes @@ -163,6 +165,7 @@ AC_SUBST(GACUTIL_FLAGS) AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) AC_SUBST(GENERATED_SOURCES) +AC_SUBST(ASSEMBLYINFO) GTK_REQUIRED_VERSION=3.0.0 GLIB_REQUIRED_VERSION=2.28.0 diff --git a/glib/Makefile.am b/glib/Makefile.am index 1e07b2de8..ccbaf2fc2 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -94,7 +94,7 @@ sources = \ Variant.cs \ VariantType.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) dist_sources = $(sources) EXTRA_DIST = \ @@ -105,7 +105,7 @@ EXTRA_DIST = \ $(ASSEMBLY): $(build_sources) $(SNK) @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(SNK) -unsafe -out:$(ASSEMBLY) -target:library $(references) $(build_sources) + $(CSC) $(CSFLAGS) -keyfile:$(SNK) -unsafe -out:$(ASSEMBLY) -target:library $(references) $(build_sources) $(top_builddir)$(ASSEMBLYINFO) policy.%.config: $(top_builddir)/policy.config sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@ diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am index 55b34d6e2..eec5c67bd 100644 --- a/gtkdotnet/Makefile.am +++ b/gtkdotnet/Makefile.am @@ -24,7 +24,7 @@ sources = \ Graphics.cs \ StyleContextExtensions.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) EXTRA_DIST = \ $(sources) \ @@ -33,7 +33,7 @@ EXTRA_DIST = \ $(ASSEMBLY): $(build_sources) $(references) $(SNK) @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources) + $(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources) $(top_builddir)$(ASSEMBLYINFO) policy.%.config: $(top_builddir)/policy.config sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@