X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2FMakefile.am;h=76d4381136d05c5a7bc3841af443e4bd0f35873b;hb=d478b34ecd49b4aff1084e64913a6c6cbe3b425e;hp=a205ad9e6634643a5dfd14d62c1a4ea049e5b027;hpb=3530b5e7c25858bc50b7e2d0f3751a170aee184f;p=mono.git

diff --git a/support/Makefile.am b/support/Makefile.am
index a205ad9e663..76d4381136d 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -26,11 +26,14 @@ MPH_C_SOURCE =					\
 # Source code which helps implement POSIX and other related Unix standards,
 # and *may* be portable between Unix platforms.
 MPH_UNIX_SOURCE =				\
+	fakepoll.h				\
 	dirent.c				\
 	fcntl.c					\
 	fstab.c					\
 	grp.c					\
 	macros.c				\
+	nl.c					\
+	nl.h					\
 	old-map.c				\
 	old-map.h				\
 	pwd.c					\
@@ -51,10 +54,10 @@ MPH_UNIX_SOURCE =				\
 
 if HOST_WIN32
 MPH_SOURCE = $(MPH_C_SOURCE)
-MPH_LIBS   = $(GLIB_LIBS)
+MPH_LIBS   = $(GLIB_LIBS) $(LIBICONV)
 else
 MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
-MPH_LIBS   = $(GLIB_LIBS)
+MPH_LIBS   = $(GLIB_LIBS) $(LIBICONV)
 endif
 
 MINIZIP_SOURCE = \
@@ -70,7 +73,6 @@ ZLIB_SOURCES = \
 	adler32.c	\
 	compress.c	\
 	crc32.c		\
-	gzio.c		\
 	uncompr.c	\
 	deflate.c	\
 	trees.c		\
@@ -103,18 +105,10 @@ libMonoPosixHelper_la_SOURCES =			\
 	$(Z_SOURCE)				\
 	$(MINIZIP_SOURCE)
 
-if HOST_WIN32
 libMonoPosixHelper_la_LIBADD =			\
 	$(MPH_LIBS)				\
 	$(Z_LIBS)				\
 	$(XATTR_LIB)
-else
-libMonoPosixHelper_la_LIBADD =			\
-	../mono/mini/libmono-2.0.la \
-	$(MPH_LIBS)				\
-	$(Z_LIBS)				\
-	$(XATTR_LIB)
-endif
 
 # libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
 libMonoPosixHelper_la_LDFLAGS = -no-undefined -avoid-version
@@ -126,7 +120,7 @@ libMonoSupportW_la_SOURCES =			\
 		supportw.h
 
 libMonoSupportW_la_LIBADD =			\
-		$(GLIB_LIBS)
+		$(GLIB_LIBS) $(LIBICONV)
 
 # 
 # Use this target to refresh the values in map.[ch]
@@ -169,5 +163,9 @@ refresh:
 patch-libtool:
 	cp "../libtool" .
 	sed -e 's,build_libtool_libs=no,build_libtool_libs=yes,g' libtool > 2; mv 2 libtool
-	sed -e 's,LIBTOOL =,LIBTOOL2 =,g' Makefile > 2 && echo "LIBTOOL = bash ./libtool" > 1 && cat 1 2 > Makefile
+	echo "LIBTOOL = bash ./libtool" > 1
+	echo "LTCOMPILE = bash ./libtool --mode=compile $(COMPILE)" >> 1
+	sed -e 's,LIBTOOL =,LIBTOOL2 =,g' Makefile > 2
+	sed -e 's,LTCOMPILE =,LTCOMPILE2 =,g' 2 > 3
+	cat 1 3 > Makefile
 	touch *.c