Merge pull request #260 from pcc/topmost

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index 1f6a51c1a8fa6fd387193c6ad100438dcc5a6361..c339ebced737526b4eed078345d66c4f46d9ae61 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,4 +1,4 @@
-if PLATFORM_WIN32
+if HOST_WIN32
 SUPPORT=
 else
 SUPPORT=libMonoSupportW.la
@@ -7,7 +7,7 @@ lib_LTLIBRARIES =                               \
        libMonoPosixHelper.la                   \
        $(SUPPORT)
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        $(GLIB_CFLAGS)                          \
        -I$(top_srcdir)
 
@@ -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                                   \
@@ -40,6 +43,7 @@ MPH_UNIX_SOURCE =                             \
        sys-stat.c                              \
        sys-statvfs.c                           \
        sys-time.c                              \
+       sys-uio.c                               \
        sys-utsname.c   \
        sys-wait.c                              \
        sys-xattr.c                             \
@@ -49,19 +53,27 @@ 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) $(LIBICONV)
 else
 MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
-MPH_LIBS   = $(GLIB_LIBS)
+MPH_LIBS   = $(GLIB_LIBS) $(LIBICONV)
 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         \
-       gzio.c          \
        uncompr.c       \
        deflate.c       \
        trees.c         \
@@ -82,16 +94,17 @@ ZLIB_SOURCES = \
        zutil.h
 
 if HAVE_ZLIB
-Z_SOURCE = zlib_macros.c 
+Z_SOURCE = zlib-helper.c
 Z_LIBS= -lz
 else
-Z_SOURCE = zlib_macros.c $(ZLIB_SOURCES)
+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)                             \
@@ -108,7 +121,7 @@ libMonoSupportW_la_SOURCES =                        \
                supportw.h
 
 libMonoSupportW_la_LIBADD =                    \
-               $(GLIB_LIBS)
+               $(GLIB_LIBS) $(LIBICONV)
 
 # 
 # Use this target to refresh the values in map.[ch]
@@ -123,21 +136,23 @@ refresh:
        --impl-macro=_GNU_SOURCE --impl-macro=_XOPEN_SOURCE   \
        --impl-header="<sys/types.h>"                         \
        --impl-header="<sys/stat.h>"                          \
-       --impl-header="<sys/time.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>"                      \
-       --impl-header="<unistd.h>"                            \
+       --autoconf-header="<sys/uio.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>"                        \
-       --impl-header="<dirent.h>"                            \
-       --impl-header="<utime.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_                    \
@@ -146,3 +161,13 @@ refresh:
        --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