[tests] Skip Local name (incorrect) assumption for iOS/tvOS/watchOS/OSX in TimeZoneIn...

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index fbed51ab89b4764d34d793bd150bc421e5e4106d..79154fc99bbd9b232eb8c4bd1e16119b07d9bb45 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES =                               \
        libMonoPosixHelper.la                   \
        $(SUPPORT)
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        $(GLIB_CFLAGS)                          \
        -I$(top_srcdir)
 
@@ -26,21 +26,24 @@ 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                                   \
        serial.c                                \
        sys-mman.c                              \
        sys-sendfile.c                          \
+       sys-socket.c                            \
        sys-stat.c                              \
        sys-statvfs.c                           \
        sys-time.c                              \
+       sys-uio.c                               \
        sys-utsname.c   \
        sys-wait.c                              \
        sys-xattr.c                             \
@@ -52,10 +55,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 = \
@@ -71,7 +74,6 @@ ZLIB_SOURCES = \
        adler32.c       \
        compress.c      \
        crc32.c         \
-       gzio.c          \
        uncompr.c       \
        deflate.c       \
        trees.c         \
@@ -119,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]
@@ -134,12 +136,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>"                            \
@@ -156,7 +161,7 @@ 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)/class/lib/net_4_x/Mono.Posix.dll map
 
 # Useful if mono is compiled with --enable-shared=no
 patch-libtool: