Merge branch 'feature-concurrent-sweep'

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index a4ecc80d36def1e2bfc1a7ea0020d6b621bb18e5..1241a7a079e60d46d531e556a58f8ddd0bde10d0 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -28,6 +28,10 @@ unix_sources = \
 platform_sources = $(unix_sources)
 endif
 
+if PLATFORM_ANDROID
+platform_sources += ../../support/libm/complex.c
+endif
+
 if SHARED_MONO
 if SUPPORT_BOEHM
 bin_PROGRAMS = pedump
@@ -199,8 +203,10 @@ common_sources = \
        threadpool.c            \
        threadpool.h            \
        threadpool-internals.h  \
-       threadpool-microsoft.c  \
-       threadpool-microsoft.h  \
+       threadpool-ms.c \
+       threadpool-ms.h \
+       threadpool-ms-io.c      \
+       threadpool-ms-io.h      \
        tpool-poll.c    \
        verify.c                \
        verify-internals.h      \
@@ -285,6 +291,8 @@ sgen_sources = \
        sgen-layout-stats.h     \
        sgen-qsort.c    \
        sgen-qsort.h    \
+       sgen-thread-pool.c      \
+       sgen-thread-pool.h      \
        sgen-tagged-pointer.h
 
 libmonoruntime_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(null_gc_sources) $(boehm_sources)
@@ -359,5 +367,5 @@ endif
 endif
 endif
 
-EXTRA_DIST = make-bundle.pl sample-bundle $(win32_sources) $(unix_sources) $(null_sources) runtime.h \
+EXTRA_DIST = $(win32_sources) $(unix_sources) $(null_sources) runtime.h \
                tpool-poll.c tpool-epoll.c tpool-kqueue.c