Finish spliting sgen-nursery-allocator into a separate compilation unit

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

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index a0ec0c6ec5a113f454b8605d643772a85de75194..64c4bd434616db4304983731a5b73e2de54623a7 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -2,55 +2,123 @@ noinst_LTLIBRARIES = libmonoutils.la
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
 
-if EGLIB_BUILD 
-hash_sources = mono-ehash.c
-else
-hash_sources = mono-hash.c
+if ENABLE_DTRACE
+
+BUILT_SOURCES = mono-dtrace.h
+
+mono-dtrace.h: $(top_srcdir)/data/mono.d
+       $(DTRACE) $(DTRACEFLAGS) -h -s $(top_srcdir)/data/mono.d -o $@ || > $@
+
 endif
 
-libmonoutils_la_SOURCES = \
-       $(hash_sources) \
-       mono-md5.c      \
-       mono-sha1.c     \
-       mono-logger.c   \
-       mono-codeman.c  \
-       mono-counters.c \
-       mono-compiler.h \
-       mono-dl.c       \
-       mono-dl.h       \
+monoutils_sources = \
+       mono-md5.c              \
+       mono-sha1.c             \
+       mono-logger.c           \
+       mono-logger-internal.h  \
+       mono-codeman.c          \
+       dlmalloc.h              \
+       dlmalloc.c              \
+       mono-counters.c         \
+       mono-compiler.h         \
+       mono-dl.c               \
+       mono-dl.h               \
        mono-internal-hash.c    \
        mono-internal-hash.h    \
        mono-io-portability.c   \
        mono-io-portability.h   \
-       monobitset.c    \
-       mono-math.c  \
-       mono-mmap.c  \
-       mono-mmap.h  \
-       mono-time.c  \
-       mono-time.h  \
-       strtod.h        \
-       strtod.c        \
-       strenc.h        \
-       strenc.c        \
-       mono-uri.c      \
-       mono-poll.c     \
-       mono-path.c     \
-       mono-stdlib.c
-
-libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils
-
-libmonoutilsinclude_HEADERS = \
+       monobitset.c            \
+       mono-filemap.c          \
+       mono-math.c             \
+       mono-mmap.c             \
+       mono-mmap.h             \
+       mono-networkinterfaces.c                \
+       mono-networkinterfaces.h                \
+       mono-proclib.c          \
+       mono-proclib.h          \
+       mono-publib.c           \
+       mono-string.h           \
+       mono-time.c             \
+       mono-time.h             \
+       strtod.h                \
+       strtod.c                \
+       strenc.h                \
+       strenc.c                \
+       mono-uri.c              \
+       mono-poll.c             \
+       mono-path.c             \
+       mono-semaphore.c        \
+       mono-semaphore.h        \
+       mono-sigcontext.h       \
+       mono-stdlib.c           \
+       mono-property-hash.h    \
+       mono-property-hash.c    \
+       mono-value-hash.h       \
+       mono-value-hash.c       \
+       freebsd-elf_common.h    \
+       freebsd-elf32.h         \
+       freebsd-elf64.h         \
+       freebsd-dwarf.h         \
+       dtrace.h                        \
+       gc_wrapper.h            \
+       mono-error.c    \
+       mono-error-internals.h  \
        monobitset.h    \
        mono-codeman.h  \
        mono-counters.h \
        mono-digest.h   \
-       mono-logger.h   \
-       mono-hash.h     \
+       mono-error.h    \
+       mono-machine.h  \
        mono-math.h     \
        mono-membar.h   \
        mono-path.h     \
        mono-poll.h     \
        mono-uri.h      \
-       mono-stdlib.h
+       mono-stdlib.h   \
+       valgrind.h      \
+       mach-support.c  \
+       mach-support.h  \
+       memcheck.h      \
+       mono-context.c  \
+       mono-context.h  \
+       mono-stack-unwinding.h  \
+       hazard-pointer.c        \
+       hazard-pointer.h        \
+       lock-free-queue.c       \
+       lock-free-queue.h       \
+       lock-free-alloc.c       \
+       lock-free-alloc.h       \
+       mono-linked-list-set.c  \
+       mono-linked-list-set.h  \
+       mono-threads.c  \
+       mono-threads-posix.c    \
+       mono-threads-mach.c     \
+       mono-threads-windows.c  \
+       mono-threads.h  \
+       mono-tls.h      \
+       linux_magic.h
+
+arch_sources = 
+
+if X86
+arch_sources += mach-support-x86.c
+endif
+
+if AMD64
+arch_sources += mach-support-amd64.c
+endif
+
+if ARM
+arch_sources += mach-support-arm.c
+endif
+
+libmonoutils_la_SOURCES = $(monoutils_sources) $(arch_sources)
+libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils
+
+libmonoutilsinclude_HEADERS =  \
+       mono-logger.h           \
+       mono-error.h            \
+       mono-publib.h           \
+       mono-dl-fallback.h
 
-EXTRA_DIST = ChangeLog mono-hash.c mono-hash.h mono-ehash.c
+EXTRA_DIST = ChangeLog mono-embed.h mono-embed.c