merge -r 60690:60700

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index 9392d935446c4a40eaa15769e069aeaf5de9f0c7..13c4eaf76c306ee5e1cd5d8b9a123005cb164e1b 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,58 +1,94 @@
 if PLATFORM_WIN32
-lib_LTLIBRARIES= 
+SUPPORT=
 else
-lib_LTLIBRARIES= libMonoPosixHelper.la
+SUPPORT=libMonoSupportW.la
 endif
+lib_LTLIBRARIES =                              \
+       libMonoPosixHelper.la                   \
+       $(SUPPORT)
 
-INCLUDES = \
-       $(GLIB_CFLAGS) \
+INCLUDES =                                     \
+       $(GLIB_CFLAGS)                          \
        -I$(top_srcdir)
 
-LIBS = \
-       $(GLIB_LIBS)
-
-MPH_SOURCE = \
-       mph.h           \
-       old-map.h       \
-       map.h           \
-       dirent.c        \
-       errno.c         \
-       fcntl.c         \
-       fstab.c   \
-       grp.c           \
-       macros.c        \
-       map.c           \
-       pwd.c           \
-       old-map.c       \
-       serial.c        \
-       signal.c        \
-       stdio.c         \
-       stdlib.c        \
-       sys-mman.c      \
-       sys-sendfile.c  \
-       sys-stat.c      \
-       sys-statvfs.c   \
-       sys-time.c      \
-       sys-wait.c      \
-       time.c          \
-       unistd.c         \
-       utime.c    \
+# Source code which helps implement the ANSI C standards, and thus *should* be
+# portable to any platform having a C compiler.
+MPH_C_SOURCE =                                 \
+       errno.c                                 \
+       map.c                                   \
+       map.h                                   \
+       mph.h                                   \
+       signal.c                                \
+       stdio.c                                 \
+       string.c                                        \
+       stdlib.c                                \
+       map-icalls.h
+
+# Source code which helps implement POSIX and other related Unix standards,
+# and *may* be portable between Unix platforms.
+MPH_UNIX_SOURCE =                              \
+       dirent.c                                \
+       fcntl.c                                 \
+       fstab.c                                 \
+       grp.c                                   \
+       macros.c                                \
+       old-map.c                               \
+       old-map.h                               \
+       pwd.c                                   \
+       serial.c                                \
+       sys-mman.c                              \
+       sys-sendfile.c                          \
+       sys-stat.c                              \
+       sys-statvfs.c                           \
+       sys-time.c                              \
+       sys-wait.c                              \
+       sys-xattr.c                             \
+       syslog.c                                \
+       time.c                                  \
+       unistd.c                                \
+       utime.c                                 \
        x-struct-str.c
 
-if HAVE_ZLIB
-libMonoPosixHelper_la_SOURCES = \
-       $(MPH_SOURCE) zlib_macros.c
+if PLATFORM_WIN32
+MPH_SOURCE = $(MPH_C_SOURCE)
+MPH_LIBS   =
+else
+MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
+MPH_LIBS   = $(GLIB_LIBS) $(CRYPT_LIBS)
+endif
 
-libMonoPosixHelper_la_LIBADD = -lz
+if HAVE_ZLIB
+Z_SOURCE = zlib_macros.c
+Z_LIBS   = -lz
 else
-libMonoPosixHelper_la_SOURCES = $(MPH_SOURCE)
+Z_SOURCE = 
+Z_LIBS   = 
 endif
 
-libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libMonoPosixHelper_la_SOURCES =                        \
+       $(MPH_SOURCE)                           \
+       $(Z_SOURCE)
+
+libMonoPosixHelper_la_LIBADD =                 \
+       $(MPH_LIBS)                             \
+       $(Z_LIBS)                               \
+       $(XATTR_LIB)
+
+# libMonoPosixHelper_la_LDFLAGS = -no-undefined -version-info 1:0:1
+libMonoPosixHelper_la_LDFLAGS = -no-undefined -avoid-version
+libMonoSupportW_la_LDFLAGS = -no-undefined -avoid-version
+
+libMonoSupportW_la_SOURCES =                   \
+               supportw.c                      \
+               support-heap.c                  \
+               supportw.h
+
+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.Posix/make-map.exe $(mcs_topdir)/class/lib/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