diff options
| author | Andreia Gaita <avidigal@novell.com> | 2010-04-07 20:42:13 +0400 |
|---|---|---|
| committer | Andreia Gaita <avidigal@novell.com> | 2010-04-07 20:42:13 +0400 |
| commit | 4309c0d96184c1675aef708f26a2a058b69e5eb8 (patch) | |
| tree | b82dd8e17820d1c09a965d750ef6429d51f7b3dc | |
| parent | aeba9d0b2f67f873cf53d8aaa7db285f594aac58 (diff) | |
* Makefile.am: create a convenience library for moon to link withmoon/2.99.0.5
svn path=/trunk/mono/; revision=154976
| -rwxr-xr-x | mono/mini/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/mini/Makefile.am | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index be1c6aae6c0..3cc5bcaeb0e 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,8 @@ +2010-04-07 Andreia Gaita <avidigal@novell.com> -Wed Apr 7 11:28:42 CEST 2010 Paolo Molaro <lupus@ximian.com> + * Makefile.am: create a convenience library for moon to link with + +2010-04-07 Paolo Molaro <lupus@ximian.com> * method-to-ir.c: optimize array accesses from generic interfaces. diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 093077b1f56..edb97fa8171 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -78,6 +78,11 @@ noinst_PROGRAMS = genmdesc lib_LTLIBRARIES = libmono-2.0.la noinst_LTLIBRARIES = libmono-static.la + +if MOONLIGHT +noinst_LTLIBRARIES += libmono-moon.la +endif + endif mono_SOURCES = \ @@ -425,6 +430,10 @@ endif libmono_2_0_la_SOURCES = $(common_sources) $(llvm_sources) $(arch_sources) $(os_sources) +if MOONLIGHT +libmono_moon_la_SOURCES = $(libmono_2_0_la_SOURCES) +endif + libmono_static_la_SOURCES = $(libmono_2_0_la_SOURCES) nodist_libmono_static_la_SOURCES = $(nodist_libmono_la_SOURCES) libmono_static_la_LDFLAGS = -static @@ -439,6 +448,10 @@ libmonoinclude_HEADERS = jit.h libmono_2_0_la_LIBADD = \ $(libs) $(LIBMONO_DTRACE_OBJECT) +if MOONLIGHT +libmono_moon_la_LIBADD = $(libmono_2_0_la_LIBADD) +endif + basic-simd.exe: basic-simd.cs $(MCS) -out:$@ $< -r:TestDriver.dll -r:Mono.Simd.dll |