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.
This commit is contained in:
Mike Kestner 2011-02-09 10:09:35 -06:00
parent 7cdaf34aa2
commit c4d06e4b7f
2 changed files with 5 additions and 11 deletions

View File

@ -10,7 +10,7 @@ noinst_DATA = $(TARGET)
TARGET_API = $(pkg:=-api.xml) TARGET_API = $(pkg:=-api.xml)
gapidir = $(datadir)/gapi-3.0 gapidir = $(datadir)/gapi-3.0
gapi_DATA = $(TARGET_API) 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 DISTCLEANFILES = $(ASSEMBLY).config
POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS))) 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) \ --glue-includes=$(glue_includes) \
&& touch generated-stamp && touch generated-stamp
AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
cp $(top_builddir)/AssemblyInfo.cs .
policy.%.config: $(top_builddir)/policy.config policy.%.config: $(top_builddir)/policy.config
sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(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) $(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
$(AL) -link:policy.$*.config -out:$@ -keyfile:$(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) build_references = $(addprefix -r:, $(references)) $(MONO_CAIRO_LIBS)
$(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references) $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)

View File

@ -10,7 +10,7 @@ SNK = $(top_srcdir)/gtk-sharp.snk
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
ASSEMBLY_NAME = gtk-dotnet ASSEMBLY_NAME = gtk-dotnet
noinst_DATA = $(ASSEMBLY) $(POLICY_ASSEMBLIES) 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 DISTCLEANFILES = $(ASSEMBLY).config
POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS))) POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS)))
@ -22,17 +22,14 @@ build_references = $(addprefix -r:, $(references)) -r:System.Drawing.dll
sources = \ sources = \
Graphics.cs Graphics.cs
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo.cs
EXTRA_DIST = \ EXTRA_DIST = \
$(sources) \ $(sources) \
$(ASSEMBLY).config.in \ $(ASSEMBLY).config.in \
gtk-dotnet-3.0.pc.in gtk-dotnet-3.0.pc.in
AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs $(ASSEMBLY): $(build_sources) $(references) $(SNK)
cp $(top_builddir)/AssemblyInfo.cs .
$(ASSEMBLY): $(build_sources) $(references) $(SNK) AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb @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)