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 066c7e85377f0a5abd0b5b98595e038d4a69628c..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) 
 
@@ -21,6 +22,7 @@ OTHER_H = \
        io-layer.h      \
        io-portability.h        \
        macros.h        \
+       messages.h      \
        mono-mutex.h    \
        mutexes.h       \
        processes.h     \
@@ -35,7 +37,7 @@ OTHER_H = \
        uglify.h        \
        versioninfo.h   \
        wait.h          \
-       wapi.h  
+       wapi.h
 
 OTHER_SRC = \
        access.h                \
@@ -47,6 +49,7 @@ OTHER_SRC = \
        context.h               \
        critical-sections.c     \
        critical-sections.h     \
+       critical-section-private.h      \
        error.c                 \
        error.h                 \
        events.c                \
@@ -61,7 +64,10 @@ OTHER_SRC = \
        io-portability.h        \
        io-private.h            \
        io-layer.h              \
+       locking.c               \
        macros.h                \
+       messages.c              \
+       messages.h              \
        misc.c                  \
        misc-private.h          \
        mutexes.c               \
@@ -69,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       \
@@ -87,7 +93,6 @@ OTHER_SRC = \
        status.h                \
        system.c                \
        system.h                \
-       threads.c               \
        threads.h               \
        thread-private.h        \
        timefuncs.c             \
@@ -95,13 +100,16 @@ OTHER_SRC = \
        timefuncs-private.h     \
        types.h                 \
        uglify.h                \
+       versioninfo.c           \
        versioninfo.h           \
        wait.c                  \
        wait.h                  \
        wapi_glob.h             \
        wapi_glob.c             \
        wapi.h                  \
-       wapi-private.h
+       wapi-private.h          \
+       wthreads.c
+
 
 WINDOWS_H = \
        io-layer.h
@@ -113,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 =   \