Merge pull request #475 from pruiz/xamarin-bug-7408

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

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 528876f4a717636db68c0202cd940094702c7a76..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,8 +11,7 @@ mono-dtrace.h: $(top_srcdir)/data/mono.d
 
 endif
 
-libmonoutils_la_SOURCES = \
-       mono-hash.c             \
+monoutils_sources = \
        mono-md5.c              \
        mono-sha1.c             \
        mono-logger.c           \
@@ -68,9 +67,8 @@ libmonoutils_la_SOURCES = \
        mono-codeman.h  \
        mono-counters.h \
        mono-digest.h   \
-       mono-embed.h    \
        mono-error.h    \
-       mono-hash.h     \
+       mono-machine.h  \
        mono-math.h     \
        mono-membar.h   \
        mono-path.h     \
@@ -78,12 +76,60 @@ libmonoutils_la_SOURCES = \
        mono-uri.h      \
        mono-stdlib.h   \
        valgrind.h      \
-       memcheck.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-publib.h
+libmonoutilsinclude_HEADERS =  \
+       mono-logger.h           \
+       mono-error.h            \
+       mono-publib.h           \
+       mono-dl-fallback.h
 
-EXTRA_DIST = ChangeLog
+EXTRA_DIST = ChangeLog mono-embed.h mono-embed.c