X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2FMakefile.am;h=8a9494054d94eaf9124c9c2731160131de14af16;hb=bfc76bafbf72f8e10c4d2cc7b12e779715c527fa;hp=5deda477e2d9a083748b77e8fb56e6f37100c9fb;hpb=e343ad0cfd404c92761cd6e0f683ccd46402897b;p=mono.git

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 5deda477e2d..8a9494054d9 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -3,8 +3,8 @@ win32_sources = \
 	console-win32.c \
 	console-win32-internals.h \
 	cominterop-win32-internals.h \
-	file-io-windows.c \
-	file-io-windows-internals.h \
+	w32file-win32.c \
+	w32file-win32-internals.h \
 	icall-windows.c \
 	icall-windows-internals.h \
 	marshal-windows.c \
@@ -16,7 +16,8 @@ win32_sources = \
 	w32event-win32.c \
 	w32process-win32.c \
 	w32process-win32-internals.h \
-	w32socket-win32.c
+	w32socket-win32.c \
+	w32error-win32.c
 
 platform_sources = $(win32_sources)
 
@@ -49,12 +50,16 @@ unix_sources = \
 	w32process-unix-bsd.c \
 	w32process-unix-haiku.c \
 	w32process-unix-default.c \
-	w32socket-unix.c
+	w32socket-unix.c \
+	w32file-unix.c \
+	w32file-unix-glob.c \
+	w32file-unix-glob.h \
+	w32error-unix.c
 
 platform_sources = $(unix_sources)
 endif
 
-if PLATFORM_ANDROID
+if HOST_ANDROID
 platform_sources += ../../support/libm/complex.c
 endif
 
@@ -116,10 +121,14 @@ null_sources = \
 	console-null.c
 
 null_gc_sources = \
-	null-gc.c
+	null-gc.c \
+	null-gc-handles.h \
+	null-gc-handles.c
 
 common_sources = \
 	$(platform_sources)	\
+	appdomain.c	\
+	domain.c	\
 	appdomain-icalls.h	\
 	assembly.c		\
 	assembly-internals.h	\
@@ -151,9 +160,9 @@ common_sources = \
 	exception.c		\
 	exception.h		\
 	exception-internals.h	\
-	file-io.c		\
-	file-io.h		\
-	file-io-internals.h \
+	w32file.c		\
+	w32file.h		\
+	w32file-internals.h \
 	filewatcher.c		\
 	filewatcher.h		\
 	gc-internals.h		\
@@ -184,10 +193,11 @@ common_sources = \
 	mono-config.c		\
 	mono-debug.h		\
 	mono-debug.c		\
-	mono-debug-debugger.h	\
+	debug-internals.h	\
 	mono-endian.c		\
 	mono-endian.h		\
 	mono-hash.h		\
+	mono-conc-hash.h		\
 	mono-mlist.c		\
 	mono-mlist.h		\
 	mono-perfcounters.c	\
@@ -197,11 +207,11 @@ common_sources = \
 	mono-route.c		\
 	mono-route.h		\
 	monitor.h		\
-	nacl-stub.c		\
 	normalization-tables.h	\
 	number-formatter.h	\
 	number-ms.c		\
 	number-ms.h		\
+	object.c	\
 	object-internals.h	\
 	opcodes.c		\
 	property-bag.h	\
@@ -264,24 +274,26 @@ common_sources = \
 	w32handle-namespace.h	\
 	w32handle-namespace.c	\
 	w32handle.h	\
-	w32handle.c
+	w32handle.c	\
+	w32error.h	\
+	reflection.c	\
+	dynamic-image.c	\
+	sre.c	\
+	sre-encode.c	\
+	sre-save.c	\
+	custom-attrs.c	\
+	fdhandle.h	\
+	fdhandle.c	\
+	callspec.h	\
+	callspec.c
 
 # These source files have compile time dependencies on GC code
 gc_dependent_sources = \
-	appdomain.c	\
-	domain.c	\
 	gc-stats.c	\
 	gc.c		\
 	monitor.c	\
 	mono-hash.c	\
-	object.c	\
-	dynamic-image.c	\
-	sre.c	\
-	sre-encode.c	\
-	sre-save.c	\
-	custom-attrs.c	\
-	reflection.c
-
+	mono-conc-hash.c
 
 boehm_sources = \
 	boehm-gc.c
@@ -340,6 +352,7 @@ libmonoruntimeinclude_HEADERS = \
 	object.h		\
 	opcodes.h		\
 	profiler.h		\
+	profiler-events.h	\
 	reflection.h		\
 	row-indexes.h		\
 	tokentype.h		\