diff options
author | Jb Evain <jbevain@gmail.com> | 2009-02-17 21:56:23 +0300 |
---|---|---|
committer | Jb Evain <jbevain@gmail.com> | 2009-02-17 21:56:23 +0300 |
commit | 047f214f488bec7db96116c07bb63b8835ef3b98 (patch) | |
tree | 2f81e8c9ba63482e63b2741a4131fb3e9b2ccda5 | |
parent | b20381c1f06a11eaa927580397b2284476edf975 (diff) |
2009-02-17 Jb Evain <jbevain@novell.com>mono-2-4mono-2-4-0
* Makefile.am: reference directly cecil from the gac as gendarme
does instead of copying it locally.
svn path=/branches/mono-2-4/mono-tools/; revision=127194
-rw-r--r-- | gui-compare/ChangeLog | 5 | ||||
-rw-r--r-- | gui-compare/Makefile.am | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/gui-compare/ChangeLog b/gui-compare/ChangeLog index cc3dd547..2f5d18e8 100644 --- a/gui-compare/ChangeLog +++ b/gui-compare/ChangeLog @@ -1,3 +1,8 @@ +2009-02-17 Jb Evain <jbevain@novell.com> + + * Makefile.am: reference directly cecil from the gac as gendarme + does instead of copying it locally. + 2009-01-06 Jb Evain <jbevain@novell.com> * CecilMetadata.cs: support some more operators. diff --git a/gui-compare/Makefile.am b/gui-compare/Makefile.am index 86df8d70..d2dccd36 100644 --- a/gui-compare/Makefile.am +++ b/gui-compare/Makefile.am @@ -1,9 +1,8 @@ guicomparedir=$(prefix)/lib/gui-compare bin_SCRIPTS = gui-compare -guicompare_DATA = gui-compare.exe Mono.Cecil.dll - -CLEANFILES = gui-compare.exe gui-compare.exe.mdb Mono.Cecil.dll gui-compare +guicompare_DATA = gui-compare.exe +CLEANFILES = gui-compare.exe gui-compare.exe.mdb gui-compare gui_compare_sources = \ $(srcdir)/gtk-gui/generated.cs \ @@ -53,12 +52,9 @@ gui_compare_resources = \ EXTRA_DIST = $(gui_compare_sources) $(gui_compare_resources) gui-compare.mds gui-compare.mdp gui-compare.in -packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cecil.dll +packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0 -r:$(CECIL_ASM) assemblies = -r:System -r:System.Core -r:Mono.Posix -r:System.Xml ress= $(foreach res,$(gui_compare_resources), $(addprefix -resource:,$(res)),$(notdir $(res))) -Mono.Cecil.dll: - cp $(CECIL_ASM) . - -gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources) Mono.Cecil.dll +gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources) $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress) $(packages) $(assemblies) |