Merge pull request #4967 from kumpera/profiler-arg-cleanup

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 7e07c2549f5daa42a9d2d83d716f67a7d7875468..a9f976f8c207799107f48d02bb367fc5019a6efb 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -2,20 +2,22 @@ if HOST_WIN32
 win32_sources = \
        console-win32.c \
        console-win32-internals.h \
-       file-io-windows.c \
-       file-io-windows-internals.h \
+       cominterop-win32-internals.h \
+       w32file-win32.c \
+       w32file-win32-internals.h \
        icall-windows.c \
        icall-windows-internals.h \
        marshal-windows.c \
        marshal-windows-internals.h \
        mono-security-windows.c \
        mono-security-windows-internals.h \
-       process-windows.c \
-       process-windows-internals.h \
        w32mutex-win32.c \
        w32semaphore-win32.c \
        w32event-win32.c \
-       socket-io-windows.c
+       w32process-win32.c \
+       w32process-win32-internals.h \
+       w32socket-win32.c \
+       w32error-win32.c
 
 platform_sources = $(win32_sources)
 
@@ -41,7 +43,18 @@ unix_sources = \
        console-unix.c \
        w32mutex-unix.c \
        w32semaphore-unix.c \
-       w32event-unix.c
+       w32event-unix.c \
+       w32process-unix.c \
+       w32process-unix-internals.h \
+       w32process-unix-osx.c \
+       w32process-unix-bsd.c \
+       w32process-unix-haiku.c \
+       w32process-unix-default.c \
+       w32socket-unix.c \
+       w32file-unix.c \
+       w32file-unix-glob.c \
+       w32file-unix-glob.h \
+       w32error-unix.c
 
 platform_sources = $(unix_sources)
 endif
@@ -112,6 +125,7 @@ null_gc_sources = \
 
 common_sources = \
        $(platform_sources)     \
+       appdomain-icalls.h      \
        assembly.c              \
        assembly-internals.h    \
        attach.h                \
@@ -119,6 +133,8 @@ common_sources = \
        cil-coff.h              \
        class.c                 \
        class-internals.h       \
+       class-inlines.h         \
+       class-accessors.c       \
        cominterop.c            \
        cominterop.h            \
        console-io.h            \
@@ -140,9 +156,9 @@ common_sources = \
        exception.c             \
        exception.h             \
        exception-internals.h   \
-       file-io.c               \
-       file-io.h               \
-       file-io-internals.h \
+       w32file.c               \
+       w32file.h               \
+       w32file-internals.h \
        filewatcher.c           \
        filewatcher.h           \
        gc-internals.h          \
@@ -173,10 +189,11 @@ common_sources = \
        mono-config.c           \
        mono-debug.h            \
        mono-debug.c            \
-       mono-debug-debugger.h   \
+       debug-internals.h       \
        mono-endian.c           \
        mono-endian.h           \
        mono-hash.h             \
+       mono-conc-hash.h                \
        mono-mlist.c            \
        mono-mlist.h            \
        mono-perfcounters.c     \
@@ -186,18 +203,20 @@ common_sources = \
        mono-route.c            \
        mono-route.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             \
-       socket-io.h             \
-       process.c               \
-       process.h               \
-       process-internals.h \
+       property-bag.h  \
+       property-bag.c  \
+       w32socket.c             \
+       w32socket.h             \
+       w32socket-internals.h           \
+       w32process.c            \
+       w32process.h            \
+       w32process-internals.h          \
        profiler.c              \
        profiler-private.h      \
        rand.h                  \
@@ -218,10 +237,12 @@ common_sources = \
        tabledefs.h             \
        threads.c               \
        threads-types.h         \
-       threadpool-ms.c \
-       threadpool-ms.h \
-       threadpool-ms-io.c      \
-       threadpool-ms-io.h      \
+       threadpool.c    \
+       threadpool.h    \
+       threadpool-worker-default.c     \
+       threadpool-worker.h     \
+       threadpool-io.c \
+       threadpool-io.h \
        verify.c                \
        verify-internals.h      \
        wrapper-types.h \
@@ -246,7 +267,10 @@ common_sources = \
        w32semaphore.h  \
        w32event.h      \
        w32handle-namespace.h   \
-       w32handle-namespace.c
+       w32handle-namespace.c   \
+       w32handle.h     \
+       w32handle.c     \
+       w32error.h
 
 # These source files have compile time dependencies on GC code
 gc_dependent_sources = \
@@ -256,6 +280,7 @@ gc_dependent_sources = \
        gc.c            \
        monitor.c       \
        mono-hash.c     \
+       mono-conc-hash.c        \
        object.c        \
        dynamic-image.c \
        sre.c   \
@@ -328,4 +353,4 @@ libmonoruntimeinclude_HEADERS = \
        verify.h                
 
 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 sgen-dynarray.h
+               threadpool-io-poll.c threadpool-io-epoll.c threadpool-io-kqueue.c sgen-dynarray.h