Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index f53fe0b14c2364d3d428795fc6cff9587b3fffa2..969ff60e4db002c8b5abe4f7360b1b48a6add11b 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)
 
@@ -31,15 +31,20 @@ MPH_UNIX_SOURCE =                           \
        fstab.c                                 \
        grp.c                                   \
        macros.c                                \
+       nl.c                                    \
+       nl.h                                    \
        old-map.c                               \
        old-map.h                               \
        pwd.c                                   \
        serial.c                                \
        sys-mman.c                              \
        sys-sendfile.c                          \
+       sys-socket.c                            \
        sys-stat.c                              \
        sys-statvfs.c                           \
        sys-time.c                              \
+       sys-uio.c                               \
+       sys-uio.h                               \
        sys-utsname.c   \
        sys-wait.c                              \
        sys-xattr.c                             \
@@ -49,12 +54,12 @@ 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 = \
@@ -70,7 +75,6 @@ ZLIB_SOURCES = \
        adler32.c       \
        compress.c      \
        crc32.c         \
-       gzio.c          \
        uncompr.c       \
        deflate.c       \
        trees.c         \
@@ -91,10 +95,10 @@ 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
 
@@ -118,7 +122,7 @@ libMonoSupportW_la_SOURCES =                        \
                supportw.h
 
 libMonoSupportW_la_LIBADD =                    \
-               $(GLIB_LIBS)
+               $(GLIB_LIBS) $(LIBICONV)
 
 # 
 # Use this target to refresh the values in map.[ch]
@@ -133,12 +137,15 @@ refresh:
        --impl-macro=_GNU_SOURCE --impl-macro=_XOPEN_SOURCE   \
        --impl-header="<sys/types.h>"                         \
        --impl-header="<sys/stat.h>"                          \
+       --autoconf-header="<netinet/in.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="<sys/socket.h>"                    \
+       --autoconf-header="<sys/uio.h>"                       \
        --autoconf-header="<unistd.h>"                        \
        --impl-header="<fcntl.h>"                             \
        --impl-header="<signal.h>"                            \
@@ -155,11 +162,15 @@ refresh:
        --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
+       $(mcs_topdir_from_srcdir)/class/lib/net_4_x/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
-       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