X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2FMakefile.am;h=95299f8fa9c00611218bb44b1575e82a2c65c213;hb=ea353d283da27137baa805497199f6e8ae2cf9d6;hp=e56d1a1b69c5e401ff353e190b16c41b26284631;hpb=0443306d611d0830e27327e1f0a3ef3457dfa535;p=mono.git

diff --git a/support/Makefile.am b/support/Makefile.am
index e56d1a1b69c..95299f8fa9c 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,4 +1,4 @@
-if PLATFORM_WIN32
+if HOST_WIN32
 SUPPORT=
 else
 SUPPORT=libMonoSupportW.la
@@ -21,17 +21,19 @@ MPH_C_SOURCE =					\
 	signal.c				\
 	stdio.c					\
 	string.c					\
-	stdlib.c				\
-	map-icalls.h
+	stdlib.c
 
 # 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					\
@@ -41,6 +43,7 @@ MPH_UNIX_SOURCE =				\
 	sys-stat.c				\
 	sys-statvfs.c				\
 	sys-time.c				\
+	sys-utsname.c   \
 	sys-wait.c				\
 	sys-xattr.c				\
 	syslog.c				\
@@ -49,25 +52,58 @@ MPH_UNIX_SOURCE =				\
 	utime.c					\
 	x-struct-str.c
 
-if PLATFORM_WIN32
+if HOST_WIN32
 MPH_SOURCE = $(MPH_C_SOURCE)
-MPH_LIBS   =
+MPH_LIBS   = $(GLIB_LIBS)
 else
 MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
 MPH_LIBS   = $(GLIB_LIBS)
 endif
 
+MINIZIP_SOURCE = \
+	minizip/crypt.h \
+	minizip/ioapi.c	\
+	minizip/ioapi.h \
+	minizip/unzip.c	\
+	minizip/unzip.h	\
+	minizip/zip.c	\
+	minizip/zip.h
+
+ZLIB_SOURCES = \
+	adler32.c	\
+	compress.c	\
+	crc32.c		\
+	uncompr.c	\
+	deflate.c	\
+	trees.c		\
+	zutil.c		\
+	inflate.c	\
+	infback.c	\
+	inftrees.c	\
+	inffast.c	\
+	crc32.h		\
+	deflate.h  	\
+	inffast.h  	\
+	inffixed.h  	\
+	inflate.h  	\
+	inftrees.h  	\
+	trees.h  	\
+	zconf.h  	\
+	zlib.h  	\
+	zutil.h
+
 if HAVE_ZLIB
-Z_SOURCE = zlib_macros.c
-Z_LIBS   = -lz
+Z_SOURCE = zlib-helper.c
+Z_LIBS= -lz
 else
-Z_SOURCE = 
-Z_LIBS   = 
+Z_SOURCE = zlib-helper.c $(ZLIB_SOURCES)
+Z_LIBS=
 endif
 
 libMonoPosixHelper_la_SOURCES =			\
 	$(MPH_SOURCE)				\
-	$(Z_SOURCE)
+	$(Z_SOURCE)				\
+	$(MINIZIP_SOURCE)
 
 libMonoPosixHelper_la_LIBADD =			\
 	$(MPH_LIBS)				\
@@ -90,5 +126,46 @@ libMonoSupportW_la_LIBADD =			\
 # Use this target to refresh the values in map.[ch]
 #
 refresh:
-	$(top_builddir)/runtime/mono-wrapper $(mcs_topdir)/class/Mono.Posix/Mono.Unix.Native/make-map.exe $(mcs_topdir)/class/lib/default/Mono.Posix.dll map
+	cp `pkg-config --variable=Programs create-native-map` . && \
+	$(top_builddir)/runtime/mono-wrapper create-native-map.exe \
+	--autoconf-member=d_off                               \
+	--autoconf-member=d_reclen                            \
+	--autoconf-member=d_type                              \
+	--exclude-native-symbol=Mono_Posix_Stdlib_snprintf    \
+	--impl-macro=_GNU_SOURCE --impl-macro=_XOPEN_SOURCE   \
+	--impl-header="<sys/types.h>"                         \
+	--impl-header="<sys/stat.h>"                          \
+	--autoconf-header="<sys/time.h>"                      \
+	--autoconf-header="<sys/poll.h>"                      \
+	--autoconf-header="<sys/wait.h>"                      \
+	--autoconf-header="<sys/statvfs.h>"                   \
+	--autoconf-header="<sys/xattr.h>"                     \
+	--autoconf-header="<sys/mman.h>"                      \
+	--autoconf-header="<unistd.h>"                        \
+	--impl-header="<fcntl.h>"                             \
+	--impl-header="<signal.h>"                            \
+	--autoconf-header="<poll.h>"                          \
+	--autoconf-header="<grp.h>"                           \
+	--impl-header="<errno.h>"                             \
+	--autoconf-header="<syslog.h>"                        \
+	--autoconf-header="<dirent.h>"                        \
+	--autoconf-header="<utime.h>"                         \
+	--impl-header="<time.h>"                              \
+	--impl-header="\"mph.h\""                             \
+	--rename-member=st_atime=st_atime_                    \
+	--rename-member=st_ctime=st_ctime_                    \
+	--rename-member=st_mtime=st_mtime_                    \
+	--rename-namespace=Mono.Unix.Native=Mono.Posix        \
+	--library=MonoPosixHelper                             \
+	$(mcs_topdir)/class/lib/net_2_0/Mono.Posix.dll map
 
+# Useful if mono is compiled with --enable-shared=no
+patch-libtool:
+	cp "../libtool" .
+	sed -e 's,build_libtool_libs=no,build_libtool_libs=yes,g' libtool > 2; mv 2 libtool
+	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