2008-03-31 Miguel de Icaza <miguel@novell.com>

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index e56d1a1b69c5e401ff353e190b16c41b26284631..1f6a51c1a8fa6fd387193c6ad100438dcc5a6361 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -21,8 +21,7 @@ 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.
@@ -41,6 +40,7 @@ MPH_UNIX_SOURCE =                             \
        sys-stat.c                              \
        sys-statvfs.c                           \
        sys-time.c                              \
+       sys-utsname.c   \
        sys-wait.c                              \
        sys-xattr.c                             \
        syslog.c                                \
@@ -57,12 +57,36 @@ MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
 MPH_LIBS   = $(GLIB_LIBS)
 endif
 
+ZLIB_SOURCES = \
+       adler32.c       \
+       compress.c      \
+       crc32.c         \
+       gzio.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_macros.c 
+Z_LIBS= -lz
 else
-Z_SOURCE = 
-Z_LIBS   = 
+Z_SOURCE = zlib_macros.c $(ZLIB_SOURCES)
+Z_LIBS=
 endif
 
 libMonoPosixHelper_la_SOURCES =                        \
@@ -90,5 +114,35 @@ 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>"                          \
+       --impl-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>"                            \
+       --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>"                             \
+       --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