Merge pull request #551 from jack-pappas/sgen-patch

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

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 1b33df143887b511ac14ee7fa0374526a64ecf63..2745782762e3ed40947febce383f2dcf27761db4 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmonoutils.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS)
 
 if ENABLE_DTRACE
 
@@ -11,17 +11,11 @@ mono-dtrace.h: $(top_srcdir)/data/mono.d
 
 endif
 
-if EGLIB_BUILD 
-hash_sources = mono-ehash.c
-else
-hash_sources = mono-hash.c
-endif
-
-libmonoutils_la_SOURCES = \
-       $(hash_sources)         \
+monoutils_sources = \
        mono-md5.c              \
        mono-sha1.c             \
        mono-logger.c           \
+       mono-logger-internal.h  \
        mono-codeman.c          \
        dlmalloc.h              \
        dlmalloc.c              \
@@ -42,6 +36,7 @@ libmonoutils_la_SOURCES = \
        mono-networkinterfaces.h                \
        mono-proclib.c          \
        mono-proclib.h          \
+       mono-publib.c           \
        mono-string.h           \
        mono-time.c             \
        mono-time.h             \
@@ -52,6 +47,7 @@ libmonoutils_la_SOURCES = \
        mono-uri.c              \
        mono-poll.c             \
        mono-path.c             \
+       mono-semaphore.c        \
        mono-semaphore.h        \
        mono-sigcontext.h       \
        mono-stdlib.c           \
@@ -66,24 +62,74 @@ libmonoutils_la_SOURCES = \
        dtrace.h                        \
        gc_wrapper.h            \
        mono-error.c    \
-       mono-error.h    \
-       mono-error-internal.h
-
-libmonoutilsincludedir = $(includedir)/mono-$(API_VER)/mono/utils
-
-libmonoutilsinclude_HEADERS = \
+       mono-error-internals.h  \
        monobitset.h    \
        mono-codeman.h  \
        mono-counters.h \
        mono-digest.h   \
-       mono-embed.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       \
+       lock-free-array-queue.c \
+       lock-free-array-queue.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   \
+       mono-memory-model.h
+
+arch_sources = 
+
+if !CROSS_COMPILE
+
+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
+
+else
+
+arch_sources += mach-support-unknown.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