X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2FMakefile.am;h=e798ad7da2d4e50be179dd9ab317a38c485803e3;hb=b05b9543a5ed0b3bffb54e50e39a1df9a379651a;hp=dab02dedc1ed057ee1e92bca9e9147e1f197a891;hpb=6e6b9bcbe03b4502f9653bca229b0ac3474ba1a6;p=mono.git

diff --git a/support/Makefile.am b/support/Makefile.am
index dab02dedc1e..e798ad7da2d 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,54 +1,91 @@
 if PLATFORM_WIN32
-lib_LTLIBRARIES= 
+SUPPORT=
 else
-lib_LTLIBRARIES= libMonoPosixHelper.la
+SUPPORT=libMonoSupportW.la
 endif
+lib_LTLIBRARIES = 				\
+	libMonoPosixHelper.la			\
+	$(SUPPORT)
 
-INCLUDES = \
-	$(GLIB_CFLAGS) \
+INCLUDES =					\
+	$(GLIB_CFLAGS)				\
 	-I$(top_srcdir)
 
-MPH_SOURCE = \
-	mph.h 		\
-	old-map.h 	\
-	map.h 		\
-	dirent.c 	\
-	errno.c 	\
-	fcntl.c 	\
-	fstab.c   \
-	grp.c 		\
-	macros.c	\
-	map.c 		\
-	pwd.c 		\
-	old-map.c 	\
-	serial.c	\
-	stdio.c 	\
-	stdlib.c 	\
-	sys-mman.c 	\
-	sys-sendfile.c 	\
-	sys-stat.c 	\
-	sys-statvfs.c 	\
-	sys-time.c 	\
-	sys-wait.c 	\
-	time.c 		\
-	unistd.c	 \
-	utime.c    \
+# Source code which helps implement the ANSI C standards, and thus *should* be
+# portable to any platform having a C compiler.
+MPH_C_SOURCE =					\
+	errno.c					\
+	map.c					\
+	map.h					\
+	mph.h					\
+	signal.c				\
+	stdio.c					\
+	stdlib.c				\
+	map-icalls.h
+
+# Source code which helps implement POSIX and other related Unix standards,
+# and *may* be portable between Unix platforms.
+MPH_UNIX_SOURCE =				\
+	dirent.c				\
+	fcntl.c					\
+	fstab.c					\
+	grp.c					\
+	macros.c				\
+	old-map.c				\
+	old-map.h				\
+	pwd.c					\
+	serial.c				\
+	sys-mman.c				\
+	sys-sendfile.c				\
+	sys-stat.c				\
+	sys-statvfs.c				\
+	sys-time.c				\
+	sys-wait.c				\
+	sys-xattr.c				\
+	time.c					\
+	unistd.c				\
+	utime.c					\
 	x-struct-str.c
 
-if HAVE_ZLIB
-libMonoPosixHelper_la_SOURCES = \
-	$(MPH_SOURCE) zlib_macros.c
+if PLATFORM_WIN32
+MPH_SOURCE = $(MPH_C_SOURCE)
+MPH_LIBS   =
+else
+MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
+MPH_LIBS   = $(GLIB_LIBS)
+endif
 
-libMonoPosixHelper_la_LIBADD = -lz
+if HAVE_ZLIB
+Z_SOURCE = zlib_macros.c
+Z_LIBS   = -lz
 else
-libMonoPosixHelper_la_SOURCES = $(MPH_SOURCE)
+Z_SOURCE = 
+Z_LIBS   = 
 endif
 
-libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libMonoPosixHelper_la_SOURCES =			\
+	$(MPH_SOURCE)				\
+	$(Z_SOURCE)
+
+libMonoPosixHelper_la_LIBADD =			\
+	$(MPH_LIBS)				\
+	$(Z_LIBS)				\
+	$(XATTR_LIB)
+
+# libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libMonoPosixHelper_la_LDFLAGS = -no-undefined -avoid-version
+libMonoSupportW_la_LDFLAGS = -no-undefined -avoid-version
+
+libMonoSupportW_la_SOURCES =			\
+		supportw.c			\
+		supportw.h
+
+libMonoSupportW_la_LIBADD =					\
+		$(GLIB_LIBS)
 
 # 
 # Use this target to refresh the values in map.[ch]
 #
 refresh:
-	$(top_builddir)/runtime/mono-wrapper $(mcs_topdir)/class/Mono.Posix/Mono.Posix/make-map.exe $(mcs_topdir)/class/lib/Mono.Posix.dll map
+	$(top_builddir)/runtime/mono-wrapper $(mcs_topdir)/class/Mono.Posix/Mono.Unix/make-map.exe $(mcs_topdir)/class/lib/default/Mono.Posix.dll map