Merge pull request #1624 from esdrubal/getprocesstimes

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

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index a824ba8bea0f0601bfa02c10619ce24922286a55..47e31071494b9df89ae82ae2fea109eaa4ab91ee 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,19 +1,19 @@
+
 noinst_LTLIBRARIES = libwapi.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS)          \
-       $(LIBGC_CFLAGS)         \
+       $(LIBGC_CPPFLAGS)       \
        -DMONO_BINDIR=\""$(bindir)"\"   \
-       -I$(top_srcdir) 
+       -I$(top_srcdir) \
+       $(SHARED_CFLAGS)
 
 libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer
 
 OTHER_H = \
        access.h        \
-       atomic.h        \
        collection.h    \
        context.h       \
-       critical-sections.h     \
        error.h         \
        events.h        \
        handles.h       \
@@ -21,32 +21,28 @@ OTHER_H = \
        io-layer.h      \
        io-portability.h        \
        macros.h        \
-       mono-mutex.h    \
+       messages.h      \
        mutexes.h       \
        processes.h     \
        security.h      \
        semaphores.h    \
        sockets.h       \
        status.h        \
-       system.h        \
        threads.h       \
        timefuncs.h     \
        types.h         \
        uglify.h        \
        versioninfo.h   \
        wait.h          \
-       wapi.h  
+       wapi.h          \
+       wapi-remap.h
 
 OTHER_SRC = \
        access.h                \
-       atomic.c                \
-       atomic.h                \
        collection.c            \
        collection.h            \
        context.c               \
        context.h               \
-       critical-sections.c     \
-       critical-sections.h     \
        error.c                 \
        error.h                 \
        events.c                \
@@ -61,15 +57,16 @@ 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               \
        mutexes.h               \
        mutex-private.h         \
-       mono-mutex.c            \
-       mono-mutex.h            \
-       mono-spinlock.h         \
+       posix.c                 \
        processes.c             \
        processes.h             \
        process-private.h       \
@@ -85,9 +82,6 @@ OTHER_SRC = \
        socket-private.h        \
        socket-wrappers.h       \
        status.h                \
-       system.c                \
-       system.h                \
-       threads.c               \
        threads.h               \
        thread-private.h        \
        timefuncs.c             \
@@ -95,11 +89,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
@@ -108,26 +107,17 @@ WINDOWS_SRC = \
        io-layer.h              \
        io-layer-dummy.c
 
-HPPA_SRC = \
-       hppa_atomic.s
-
-if PLATFORM_WIN32
-libwapi_la_SOURCES = $(WINDOWS_SRC)
-libwapiinclude_HEADERS = $(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)
+if HOST_WIN32
+libwapi_la_SOURCES = $(WINDOWS_SRC) $(WINDOWS_H)
 else
-libwapi_la_SOURCES = $(OTHER_SRC)
+libwapi_la_SOURCES = $(OTHER_SRC) $(OTHER_H)
 endif
-libwapiinclude_HEADERS = $(OTHER_H)
+if PLATFORM_DARWIN
+libwapi_la_LIBADD = -lproc
 endif
 
 EXTRA_DIST =   \
-       $(WINDOWS_SRC)  \
-        $(HPPA_SRC) \
+       $(WINDOWS_SRC)
        $(OTHER_SRC)