Merge pull request #1659 from alexanderkyte/stringbuilder-referencesource

[mono.git] / mono / metadata / Makefile.am

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index e574b360e6da98a759a5b7feb22467a90fc1f1ca..a4ecc80d36def1e2bfc1a7ea0020d6b621bb18e5 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -61,27 +61,32 @@ boehm_libraries = $(shared_boehm_libraries) libmonoruntime-static.la
 endif
 
 if DISABLE_EXECUTABLES
-noinst_LTLIBRARIES = $(shared_sgen_libraries) $(shared_boehm_libraries)
+noinst_LTLIBRARIES = libmonoruntime-config.la $(shared_sgen_libraries) $(shared_boehm_libraries)
 else
-noinst_LTLIBRARIES = $(boehm_libraries) $(sgen_libraries)
+noinst_LTLIBRARIES = libmonoruntime-config.la $(boehm_libraries) $(sgen_libraries)
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
 
 #
 # Make sure any prefix changes are updated in the binaries too.
 #
-#  assembly.c uses MONO_ASSEMBLIES
-#  mono-config.c uses MONO_CFG_DIR
-#
 # This won't result in many more false positives than AC_DEFINEing them
 # in configure.ac.
 #
-assembly.lo mono-config.lo: Makefile
+mono-config-dirs.lo: Makefile
 
-CLEANFILES = mono-bundle.stamp
+#
+# This library is used to localize the usage of MONO_BINDIR etc. to just one source file, thus enabling
+# ccache to work even if the value of these defines change. We need to use a convenience library since automake
+# doesn't support per file cflags.
+#
+libmonoruntime_config_la_SOURCES = \
+       mono-config-dirs.h              \
+       mono-config-dirs.c
+libmonoruntime_config_la_CPPFLAGS = $(AM_CPPFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
-libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
+CLEANFILES = mono-bundle.stamp
 
 null_sources = \
        console-null.c
@@ -108,8 +113,8 @@ common_sources = \
        debug-helpers.c         \
        debug-mono-symfile.h    \
        debug-mono-symfile.c    \
-       decimal.c               \
-       decimal.h               \
+       decimal-ms.c            \
+       decimal-ms.h            \
        domain-internals.h      \
        environment.c           \
        environment.h           \
@@ -194,6 +199,9 @@ common_sources = \
        threadpool.c            \
        threadpool.h            \
        threadpool-internals.h  \
+       threadpool-microsoft.c  \
+       threadpool-microsoft.h  \
+       tpool-poll.c    \
        verify.c                \
        verify-internals.h      \
        wrapper-types.h \
@@ -203,7 +211,9 @@ common_sources = \
        file-mmap.h     \
        object-offsets.h        \
        abi-details.h   \
-       metadata-cross-helpers.c
+       metadata-cross-helpers.c        \
+       seq-points-data.h       \
+       seq-points-data.c
 
 
 # These source files have compile time dependencies on GC code
@@ -256,6 +266,7 @@ sgen_sources = \
        sgen-minor-scan-object.h \
        sgen-marksweep-drain-gray-stack.h       \
        sgen-protocol.h         \
+       sgen-protocol-def.h             \
        sgen-scan-object.h      \
        sgen-nursery-allocator.c        \
        sgen-hash-table.c       \
@@ -278,17 +289,21 @@ sgen_sources = \
 
 libmonoruntime_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(null_gc_sources) $(boehm_sources)
 libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES)
+libmonoruntime_la_LIBADD = libmonoruntime-config.la
 
 libmonoruntimesgen_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(sgen_sources)
 libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES)
+libmonoruntimesgen_la_LIBADD = libmonoruntime-config.la
 
 libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 libmonoruntime_static_la_LDFLAGS = -static
 libmonoruntime_static_la_CFLAGS = $(BOEHM_DEFINES)
+libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
 
 libmonoruntimesgen_static_la_SOURCES = $(libmonoruntimesgen_la_SOURCES)
 libmonoruntimesgen_static_la_LDFLAGS = -static
 libmonoruntimesgen_static_la_CFLAGS = $(SGEN_DEFINES)
+libmonoruntimesgen_static_la_LIBADD = $(libmonoruntimesgen_la_LIBADD)
 
 libmonoruntimeincludedir = $(includedir)/mono-$(API_VER)/mono/metadata