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 64c4bd434616db4304983731a5b73e2de54623a7..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
 
@@ -88,6 +88,8 @@ monoutils_sources = \
        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  \
@@ -96,10 +98,13 @@ monoutils_sources = \
        mono-threads-windows.c  \
        mono-threads.h  \
        mono-tls.h      \
-       linux_magic.h
+       linux_magic.h   \
+       mono-memory-model.h
 
 arch_sources = 
 
+if !CROSS_COMPILE
+
 if X86
 arch_sources += mach-support-x86.c
 endif
@@ -112,6 +117,12 @@ 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