X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fio-layer%2FMakefile.am;h=640012201428838b2e7eb504dcf68285e7bd89af;hb=36c9c006bc170a6c29ae4cbfe6f2b88483e9786b;hp=df9bac0f97a3c4a99cdc6203241ce2a11ea74dcf;hpb=da4f9e9b2afb23791029d0bb09d78b868aabd870;p=mono.git

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index df9bac0f97a..64001220142 100644
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,20 +1,18 @@
+
 noinst_LTLIBRARIES = libwapi.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	$(GLIB_CFLAGS)		\
-	$(GMODULE_CFLAGS)	\
-	$(LIBGC_CFLAGS)		\
+	$(LIBGC_CPPFLAGS)	\
 	-DMONO_BINDIR=\""$(bindir)"\"	\
 	-I$(top_srcdir)	
 
-libwapiincludedir = $(includedir)/mono/io-layer
+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	\
@@ -22,7 +20,7 @@ OTHER_H = \
 	io-layer.h	\
 	io-portability.h	\
 	macros.h	\
-	mono-mutex.h	\
+	messages.h	\
 	mutexes.h	\
 	processes.h	\
 	security.h	\
@@ -36,18 +34,14 @@ OTHER_H = \
 	uglify.h	\
 	versioninfo.h	\
 	wait.h		\
-	wapi.h	
+	wapi.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		\
@@ -62,15 +56,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	\
@@ -88,7 +83,6 @@ OTHER_SRC = \
 	status.h		\
 	system.c		\
 	system.h		\
-	threads.c		\
 	threads.h		\
 	thread-private.h	\
 	timefuncs.c		\
@@ -96,11 +90,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
@@ -109,26 +108,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)