Only build one version of libmonoruntimemoon.la (the convenience lib)

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index c6eb805f3f893c7e6357623b38708e3ac06838c1..2da924b4bb2b6a3e0d7996d632d15ade32af5c9e 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -44,7 +44,7 @@ sgen_libraries = $(shared_sgen_libraries) libmonoruntimesgen-static.la
 endif
 
 if MOONLIGHT
-moonlight_libraries = libmonoruntimemoon.la libmonoruntimemoon-static.la
+moonlight_libraries = libmonoruntimemoon.la
 endif
 
 if SHARED_MONO
@@ -220,10 +220,6 @@ libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 libmonoruntime_static_la_LDFLAGS = -static
 libmonoruntime_static_la_CFLAGS = $(BOEHM_DEFINES)
 
-libmonoruntimemoon_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
-libmonoruntimemoon_static_la_LDFLAGS = -static
-libmonoruntimemoon_static_la_CFLAGS = $(MOONLIGHT_DEFINES) $(BOEHM_DEFINES)
-
 libmonoruntimesgen_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 libmonoruntimesgen_static_la_LDFLAGS = -static
 libmonoruntimesgen_static_la_CFLAGS = $(SGEN_DEFINES)

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index e73a6b08de2869d0d1d2317286bef3ffa08de135..1873e6db1f1946228675ecf5ae5ecd01aeec1f9b 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -501,6 +501,7 @@ libmonosgen_2_0_la_CFLAGS = $(AM_CFLAGS) $(SGEN_DEFINES)
 if MOONLIGHT
 libmono_moon_la_SOURCES = $(libmono_2_0_la_SOURCES)
 libmono_moon_la_CFLAGS = $(AM_CFLAGS) $(MOONLIGHT_DEFINES)
+libmono_moon_la_LIBADD = $(moon_libs) $(LIBMONO_DTRACE_OBJECT)
 endif
 
 libmono_static_la_SOURCES = $(libmono_2_0_la_SOURCES)
@@ -528,11 +529,6 @@ libmono_2_0_la_LIBADD = \
 libmonosgen_2_0_la_LIBADD = \
        $(sgen_libs) $(LIBMONO_DTRACE_OBJECT)
 
-if MOONLIGHT
-libmono_moon_la_LIBADD = \
-       $(moon_libs) $(LIBMONO_DTRACE_OBJECT)
-endif
-
 basic-simd.exe: basic-simd.cs
        $(MCS) -out:$@ $< -r:TestDriver.dll -r:Mono.Simd.dll