Merge pull request #157 from garuma/tpl-dataflow-ifaces

[mono.git] / support / Makefile.am

diff --git a/support/Makefile.am b/support/Makefile.am
index 59df2c141f205efaec773b3416be213d0cd37633..76d4381136d05c5a7bc3841af443e4bd0f35873b 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -26,11 +26,14 @@ 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                                   \
@@ -51,10 +54,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 = \
@@ -70,7 +73,6 @@ ZLIB_SOURCES = \
        adler32.c       \
        compress.c      \
        crc32.c         \
-       gzio.c          \
        uncompr.c       \
        deflate.c       \
        trees.c         \
@@ -92,10 +94,10 @@ ZLIB_SOURCES = \
 
 if HAVE_ZLIB
 Z_SOURCE = zlib-helper.c
-Z_LIBS= -lz $(GLIB_LIBS)
+Z_LIBS= -lz
 else
 Z_SOURCE = zlib-helper.c $(ZLIB_SOURCES)
-Z_LIBS= $(GLIB_LIBS)
+Z_LIBS=
 endif
 
 libMonoPosixHelper_la_SOURCES =                        \
@@ -118,7 +120,7 @@ libMonoSupportW_la_SOURCES =                        \
                supportw.h
 
 libMonoSupportW_la_LIBADD =                    \
-               $(GLIB_LIBS)
+               $(GLIB_LIBS) $(LIBICONV)
 
 # 
 # Use this target to refresh the values in map.[ch]
@@ -161,5 +163,9 @@ refresh:
 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