merge -r 60690:60700

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index aab8af9e0f7893558e528377386bebbe96366d4c..13c4eaf76c306ee5e1cd5d8b9a123005cb164e1b 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,6 +1,11 @@
+if PLATFORM_WIN32
+SUPPORT=
+else
+SUPPORT=libMonoSupportW.la
+endif
 lib_LTLIBRARIES =                              \
        libMonoPosixHelper.la                   \
-       libMonoSupportW.la
+       $(SUPPORT)
 
 INCLUDES =                                     \
        $(GLIB_CFLAGS)                          \
@@ -15,6 +20,7 @@ MPH_C_SOURCE =                                        \
        mph.h                                   \
        signal.c                                \
        stdio.c                                 \
+       string.c                                        \
        stdlib.c                                \
        map-icalls.h
 
@@ -37,6 +43,7 @@ MPH_UNIX_SOURCE =                             \
        sys-time.c                              \
        sys-wait.c                              \
        sys-xattr.c                             \
+       syslog.c                                \
        time.c                                  \
        unistd.c                                \
        utime.c                                 \
@@ -47,7 +54,7 @@ MPH_SOURCE = $(MPH_C_SOURCE)
 MPH_LIBS   =
 else
 MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
-MPH_LIBS   = $(GLIB_LIBS)
+MPH_LIBS   = $(GLIB_LIBS) $(CRYPT_LIBS)
 endif
 
 if HAVE_ZLIB
@@ -64,7 +71,8 @@ libMonoPosixHelper_la_SOURCES =                       \
 
 libMonoPosixHelper_la_LIBADD =                 \
        $(MPH_LIBS)                             \
-       $(Z_LIBS)
+       $(Z_LIBS)                               \
+       $(XATTR_LIB)
 
 # libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
 libMonoPosixHelper_la_LDFLAGS = -no-undefined -avoid-version
@@ -72,15 +80,15 @@ libMonoSupportW_la_LDFLAGS = -no-undefined -avoid-version
 
 libMonoSupportW_la_SOURCES =                   \
                supportw.c                      \
+               support-heap.c                  \
                supportw.h
 
-libMonoSupportW_la_LIBADD =                                    \
-               $(top_builddir)/mono/io-layer/libwapi.la        \
-               $(top_builddir)/mono/mini/libmono.la
+libMonoSupportW_la_LIBADD =                    \
+               $(GLIB_LIBS)
 
 # 
 # Use this target to refresh the values in map.[ch]
 #
 refresh:
-       $(top_builddir)/runtime/mono-wrapper $(mcs_topdir)/class/Mono.Posix/Mono.Unix/make-map.exe $(mcs_topdir)/class/lib/default/Mono.Posix.dll map
+       $(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