Merge pull request #487 from mayerwin/patch-1

[mono.git] / mono / io-layer / Makefile.am

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 0b1f22feb9dc6bfe13ff7d079e41f2fef0edb526..29cec27d5f18f5fe6d74b5187cad09a7249809a0 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,8 +1,9 @@
+
 noinst_LTLIBRARIES = libwapi.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS)          \
-       $(LIBGC_CFLAGS)         \
+       $(LIBGC_CPPFLAGS)       \
        -DMONO_BINDIR=\""$(bindir)"\"   \
        -I$(top_srcdir) 
 
@@ -74,7 +75,7 @@ OTHER_SRC = \
        mutex-private.h         \
        mono-mutex.c            \
        mono-mutex.h            \
-       mono-spinlock.h         \
+       posix.c                 \
        processes.c             \
        processes.h             \
        process-private.h       \
@@ -120,18 +121,19 @@ WINDOWS_SRC = \
 HPPA_SRC = \
        hppa_atomic.S
 
-if PLATFORM_WIN32
-libwapi_la_SOURCES = $(WINDOWS_SRC)
-libwapiinclude_HEADERS = $(WINDOWS_H)
+if HOST_WIN32
+libwapi_la_SOURCES = $(WINDOWS_SRC) $(WINDOWS_H)
 else
 if HPPA
 libwapi_la_SOURCES = $(OTHER_SRC) $(HPPA_SRC)
 # to enable pick up of config.h
 libwapi_la_CCASFLAGS = -I$(top_builddir)
 else
-libwapi_la_SOURCES = $(OTHER_SRC)
+libwapi_la_SOURCES = $(OTHER_SRC) $(OTHER_H)
+endif
 endif
-libwapiinclude_HEADERS = $(OTHER_H)
+if PLATFORM_DARWIN
+libwapi_la_LIBADD = -lproc
 endif
 
 EXTRA_DIST =   \