Merge pull request #2003 from esdrubal/seq_test_fix2

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 0a6e4067d19b5f9fdf0d342c92d98c5d7c8f4919..d0e6fc2fa576554f18eb5aa1984da3d40d3f4d17 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -103,7 +103,6 @@ common_sources = \
        assembly.c              \
        attach.h                \
        attach.c                \
-       char-conversions.h      \
        cil-coff.h              \
        class.c                 \
        class-internals.h       \
@@ -117,6 +116,8 @@ common_sources = \
        debug-helpers.c         \
        debug-mono-symfile.h    \
        debug-mono-symfile.c    \
+       debug-mono-ppdb.h       \
+       debug-mono-ppdb.c       \
        decimal-ms.c            \
        decimal-ms.h            \
        domain-internals.h      \
@@ -129,7 +130,6 @@ common_sources = \
        filewatcher.c           \
        filewatcher.h           \
        gc-internal.h           \
-       gc-memfuncs.c           \
        icall.c                 \
        icall-def.h             \
        image.c                 \
@@ -152,8 +152,6 @@ common_sources = \
        mono-basic-block.c      \
        mono-basic-block.h      \
        mono-config.c           \
-       mono-cq.c               \
-       mono-cq.h               \
        mono-debug.h            \
        mono-debug.c            \
        mono-debug-debugger.h   \
@@ -168,12 +166,12 @@ common_sources = \
        mono-ptr-array.h        \
        mono-route.c            \
        mono-route.h            \
-       mono-wsq.c              \
-       mono-wsq.h              \
        monitor.h               \
        nacl-stub.c             \
        normalization-tables.h  \
        number-formatter.h      \
+       number-ms.c             \
+       number-ms.h             \
        object-internals.h      \
        opcodes.c               \
        socket-io.c             \
@@ -200,14 +198,10 @@ common_sources = \
        tabledefs.h             \
        threads.c               \
        threads-types.h         \
-       threadpool.c            \
-       threadpool.h            \
-       threadpool-internals.h  \
        threadpool-ms.c \
        threadpool-ms.h \
        threadpool-ms-io.c      \
        threadpool-ms-io.h      \
-       tpool-poll.c    \
        verify.c                \
        verify-internals.h      \
        wrapper-types.h \
@@ -226,6 +220,7 @@ common_sources = \
 gc_dependent_sources = \
        appdomain.c     \
        domain.c        \
+       gc-stats.c      \
        gc.c            \
        monitor.c       \
        mono-hash.c     \
@@ -239,59 +234,18 @@ sgen_sources = \
        sgen-os-posix.c         \
        sgen-os-mach.c          \
        sgen-os-win32.c         \
-       sgen-gc.c               \
-       sgen-internal.c         \
-       sgen-marksweep.c        \
-       sgen-los.c              \
-       sgen-protocol.c \
+       sgen-os-coop.c          \
        sgen-bridge.c           \
        sgen-bridge.h           \
+       sgen-bridge-internal.h  \
        sgen-old-bridge.c               \
        sgen-new-bridge.c               \
        sgen-tarjan-bridge.c            \
        sgen-toggleref.c                \
        sgen-toggleref.h                \
-       sgen-gc.h               \
-       sgen-conf.h             \
-       sgen-archdep.h          \
-       sgen-cardtable.c        \
-       sgen-cardtable.h        \
-       sgen-pointer-queue.c    \
-       sgen-pointer-queue.h    \
-       sgen-pinning.c  \
-       sgen-pinning.h  \
-       sgen-pinning-stats.c    \
-       sgen-workers.c  \
-       sgen-workers.h  \
-       sgen-gray.c     \
-       sgen-gray.h     \
-       sgen-major-copy-object.h \
-       sgen-minor-copy-object.h \
-       sgen-copy-object.h \
-       sgen-marksweep-scan-object-concurrent.h \
-       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       \
-       sgen-hash-table.h       \
-       sgen-descriptor.c               \
-       sgen-descriptor.h               \
-       sgen-alloc.c            \
-       sgen-debug.c            \
-       sgen-simple-nursery.c   \
-       sgen-split-nursery.c    \
-       sgen-memory-governor.c  \
-       sgen-memory-governor.h  \
        sgen-stw.c                              \
-       sgen-fin-weak-hash.c    \
-       sgen-layout-stats.c     \
-       sgen-layout-stats.h     \
-       sgen-qsort.c    \
-       sgen-qsort.h    \
-       sgen-tagged-pointer.h
+       sgen-mono.c             \
+       sgen-client-mono.h
 
 libmonoruntime_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(null_gc_sources) $(boehm_sources)
 libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES)
@@ -365,5 +319,5 @@ endif
 endif
 endif
 
-EXTRA_DIST = make-bundle.pl sample-bundle $(win32_sources) $(unix_sources) $(null_sources) runtime.h \
-               tpool-poll.c tpool-epoll.c tpool-kqueue.c
+EXTRA_DIST = $(win32_sources) $(unix_sources) $(null_sources) runtime.h \
+               threadpool-ms-io-poll.c threadpool-ms-io-epoll.c threadpool-ms-io-kqueue.c