Merge pull request #620 from knocte/monoservice_playground

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

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 81b252a56819a14f8d4c19ffbdd4a652ec6df89f..07cc6d663bc3482eaa6a4a86e40b502b8a6e6d9a 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,7 +1,7 @@
 
 noinst_LTLIBRARIES = libwapi.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS)          \
        $(LIBGC_CPPFLAGS)       \
        -DMONO_BINDIR=\""$(bindir)"\"   \
@@ -11,7 +11,6 @@ libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer
 
 OTHER_H = \
        access.h        \
-       atomic.h        \
        collection.h    \
        context.h       \
        critical-sections.h     \
@@ -23,7 +22,6 @@ OTHER_H = \
        io-portability.h        \
        macros.h        \
        messages.h      \
-       mono-mutex.h    \
        mutexes.h       \
        processes.h     \
        security.h      \
@@ -41,8 +39,6 @@ OTHER_H = \
 
 OTHER_SRC = \
        access.h                \
-       atomic.c                \
-       atomic.h                \
        collection.c            \
        collection.h            \
        context.c               \
@@ -73,8 +69,6 @@ OTHER_SRC = \
        mutexes.c               \
        mutexes.h               \
        mutex-private.h         \
-       mono-mutex.c            \
-       mono-mutex.h            \
        posix.c                 \
        processes.c             \
        processes.h             \
@@ -118,27 +112,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)