built a separate libmonoruntime for moonlight, so we can do -DMOONLIGHT just in the...

diff --git a/configure.in b/configure.in
index c11a69e28c5bd312935596bf24e4da9a23399ff0..c0a8613ac2d2ec23efb7d846d811de8def0c208b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2589,13 +2589,11 @@ AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the
        fi
 ])
 
+MOONLIGHT_DEFINES=
 AC_ARG_WITH(moonlight, [  --with-moonlight=yes|no|only         If you want to build Mono for Moonlight (defaults to no)],[
-       if test "x$with_moonlight" = "xyes"; then
-               AC_DEFINE(MOONLIGHT,1,[Building for Moonlight])
-       elif test "x$with_moonlight" = "xonly"; then
-               AC_DEFINE(MOONLIGHT,1,[Building for Moonlight])
-       fi
+        MOONLIGHT_DEFINES="-DMOONLIGHT"
 ], [with_moonlight=no])
+AC_SUBST(MOONLIGHT_DEFINES)
 
 
 

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 2db47d09bbd93e3998e119961f741a8a6fc78dfe..305607da3063f5736ebf0d714b45ada169cb3f20 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -38,7 +38,11 @@ if SUPPORT_SGEN
 sgen_libraries = libmonoruntimesgen.la libmonoruntimesgen-static.la 
 endif
 
-noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_libraries)
+if MOONLIGHT
+moonlight_libraries = libmonoruntimemoon.la libmonoruntimemoon-static.la
+endif
+
+noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_libraries) $(moonlight_libraries)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
@@ -198,6 +202,9 @@ libmonoruntime_la_SOURCES = \
 
 libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES)
 
+libmonoruntimemoon_la_SOURCES = $(libmonoruntime_la_SOURCES)
+libmonoruntimemoon_la_CFLAGS = $(MOONLIGHT_DEFINES) $(BOEHM_DEFINES)
+
 libmonoruntimesgen_la_SOURCES = $(libmonoruntime_la_SOURCES)
 libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES)
 
@@ -205,6 +212,10 @@ 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 5bf3fe4375599a09afafd222a11c99213cf3cd1e..3f816e6d59f520cc91c32c8f027fa4c80b4eaae4 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -24,6 +24,13 @@ sgen_libs = \
        $(monodir)/mono/utils/libmonoutils.la \
        $(GLIB_LIBS)
 
+moon_libs = \
+       $(monodir)/mono/metadata/libmonoruntimemoon.la  \
+       $(monodir)/mono/io-layer/libwapi.la     \
+       $(monodir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) \
+       $(libgc_libs)
+
 static_libs=   \
        $(monodir)/mono/metadata/libmonoruntime-static.la       \
        $(monodir)/mono/io-layer/libwapi.la     \
@@ -489,7 +496,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) $(BOEHM_DEFINES) $(LIBGC_CFLAGS)
+libmono_moon_la_CFLAGS = $(AM_CFLAGS) $(MOONLIGHT_DEFINES)
 endif
 
 libmono_static_la_SOURCES = $(libmono_2_0_la_SOURCES)
@@ -518,7 +525,8 @@ libmonosgen_2_0_la_LIBADD = \
        $(sgen_libs) $(LIBMONO_DTRACE_OBJECT)
 
 if MOONLIGHT
-libmono_moon_la_LIBADD = $(libmono_2_0_la_LIBADD)
+libmono_moon_la_LIBADD = \
+       $(moon_libs) $(LIBMONO_DTRACE_OBJECT)
 endif
 
 basic-simd.exe: basic-simd.cs