[xbuild] Fix warnings.

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index 8be4b797844a8d7f1bec11d3ddeb1b5bec20f8df..c64bfc827c1dd499d16cada51d778f5fda1fabe5 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
@@ -26,6 +26,7 @@ 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                                 \
@@ -49,19 +50,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)
 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         \
-       gzio.c          \
        uncompr.c       \
        deflate.c       \
        trees.c         \
@@ -82,16 +91,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)                             \
@@ -123,21 +133,22 @@ 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="<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_                    \
@@ -150,5 +161,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