From c4d06e4b7f5fe1449755f10f77b75b47f543a840 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 9 Feb 2011 10:09:35 -0600 Subject: [PATCH] Stop copying AssemblyInfo.cs around. * Makefile.include: * gtkdotnet/Makefile.am: Now that the keyfile stuff is compiler switch driven, we don't need to copy around these AssemblyInfo attrs either. Already fixed the key copying. --- Makefile.include | 7 ++----- gtkdotnet/Makefile.am | 9 +++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.include b/Makefile.include index a6f0b52d1..83e9a3e1c 100644 --- a/Makefile.include +++ b/Makefile.include @@ -10,7 +10,7 @@ noinst_DATA = $(TARGET) TARGET_API = $(pkg:=-api.xml) gapidir = $(datadir)/gapi-3.0 gapi_DATA = $(TARGET_API) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*.cs $(API) glue/generated.c AssemblyInfo.cs $(POLICY_CONFIGS) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*.cs $(API) glue/generated.c $(POLICY_CONFIGS) DISTCLEANFILES = $(ASSEMBLY).config POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS))) @@ -40,16 +40,13 @@ generated-stamp: $(API) $(INCLUDE_API) $(top_builddir)/generator/gapi_codegen.ex --glue-includes=$(glue_includes) \ && touch generated-stamp -AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs - cp $(top_builddir)/AssemblyInfo.cs . - 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_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs build_references = $(addprefix -r:, $(references)) $(MONO_CAIRO_LIBS) $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references) diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am index 1a5458762..9dea76f5b 100644 --- a/gtkdotnet/Makefile.am +++ b/gtkdotnet/Makefile.am @@ -10,7 +10,7 @@ SNK = $(top_srcdir)/gtk-sharp.snk ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = gtk-dotnet noinst_DATA = $(ASSEMBLY) $(POLICY_ASSEMBLIES) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) DISTCLEANFILES = $(ASSEMBLY).config POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS))) @@ -22,17 +22,14 @@ build_references = $(addprefix -r:, $(references)) -r:System.Drawing.dll sources = \ Graphics.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs EXTRA_DIST = \ $(sources) \ $(ASSEMBLY).config.in \ gtk-dotnet-3.0.pc.in -AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs - cp $(top_builddir)/AssemblyInfo.cs . - -$(ASSEMBLY): $(build_sources) $(references) $(SNK) AssemblyInfo.cs +$(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)