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 31680d23aa0d13fffb43b63f9588b5379c5b0884..47e31071494b9df89ae82ae2fea109eaa4ab91ee 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,20 +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       \
@@ -23,33 +22,27 @@ OTHER_H = \
        io-portability.h        \
        macros.h        \
        messages.h      \
-       mono-mutex.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     \
-       critical-section-private.h      \
        error.c                 \
        error.h                 \
        events.c                \
@@ -73,8 +66,6 @@ OTHER_SRC = \
        mutexes.c               \
        mutexes.h               \
        mutex-private.h         \
-       mono-mutex.c            \
-       mono-mutex.h            \
        posix.c                 \
        processes.c             \
        processes.h             \
@@ -91,8 +82,6 @@ OTHER_SRC = \
        socket-private.h        \
        socket-wrappers.h       \
        status.h                \
-       system.c                \
-       system.h                \
        threads.h               \
        thread-private.h        \
        timefuncs.c             \
@@ -118,27 +107,17 @@ WINDOWS_SRC = \
        io-layer.h              \
        io-layer-dummy.c
 
-HPPA_SRC = \
-       hppa_atomic.S
-
 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) $(OTHER_H)
 endif
-endif
 if PLATFORM_DARWIN
 libwapi_la_LIBADD = -lproc
 endif
 
 EXTRA_DIST =   \
-       $(WINDOWS_SRC)  \
-        $(HPPA_SRC) \
+       $(WINDOWS_SRC)
        $(OTHER_SRC)