Make sure everything that links with eglib also links with libiconv

diff --git a/eglib/test/Makefile.am b/eglib/test/Makefile.am
index 39eb7b091942836585d504e9e9e744c4b79a4384..dfa708025a3b1a984a6f06bb7fc7557ffd0dba5a 100644 (file)
--- a/eglib/test/Makefile.am
+++ b/eglib/test/Makefile.am
@@ -32,7 +32,7 @@ SOURCES = \
 test_eglib_SOURCES = $(SOURCES)
 
 test_eglib_CFLAGS = -Wall -D_FORTIFY_SOURCE=2 -I$(srcdir)/../src -I../src -DDRIVER_NAME=\"EGlib\"
-test_eglib_LDADD = ../src/libeglib.la
+test_eglib_LDADD = ../src/libeglib.la $(LIBICONV)
 
 run-eglib: all
        srcdir=`readlink -f $(srcdir)` ./test-eglib

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 05b82ec4747bb6b1dc8646ef8a8e9a478de16966..284bdbdc71c71be1ba825ed8c39d144550c745d3 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -34,7 +34,8 @@ monodis_LDADD =                       \
        libmonodis.a                    \
        $(runtime_lib)                  \
        $(LLVM_LIBS)                    \
-       $(GLIB_LIBS) 
+       $(GLIB_LIBS)                    \
+       $(LIBICONV)
 
 if PLATFORM_DARWIN
 monodis_LDFLAGS=-framework CoreFoundation

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index dc29d1530d6361c99d2bd45e1c570a52d43c572e..4b21cbb2417d859d39e3ef08b0044531a4c2640b 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -52,6 +52,7 @@ libmint_la_LIBADD =                           \
        ../utils/libmonoutils.la        \
        $(libgc_libs)                   \
        $(GLIB_LIBS)                    \
+       $(LIBICONV)                     \
        $(ICU_LIBS)                     \
        -lm
 

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 2b822522eb0fba73b524eb41b3d15657be93a3b8..a271376e387025ca3a62d8d0674e448463bd2a4d 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -15,35 +15,35 @@ libs=       \
        $(monodir)/mono/metadata/libmonoruntime.la      \
        $(monodir)/mono/io-layer/libwapi.la     \
        $(monodir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS)    \
+       $(GLIB_LIBS) $(LIBICONV) \
        $(libgc_libs)
 
 sgen_libs = \
        $(monodir)/mono/metadata/libmonoruntimesgen.la  \
        $(monodir)/mono/io-layer/libwapi.la     \
        $(monodir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) $(LIBICONV)
 
 if MOONLIGHT
 moon_libs = \
        $(monodir)/mono/metadata/libmonoruntimemoon.la  \
        $(monodir)/mono/io-layer/libwapi.la     \
        $(monodir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) $(LIBICONV)
 endif
 
 static_libs=   \
        $(monodir)/mono/metadata/libmonoruntime-static.la       \
        $(monodir)/mono/io-layer/libwapi.la     \
        $(monodir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS)    \
+       $(GLIB_LIBS) $(LIBICONV) \
        $(libgc_static_libs)
 
 sgenstatic_libs = \
        $(monodir)/mono/metadata/libmonoruntimesgen-static.la   \
        $(monodir)/mono/io-layer/libwapi.la     \
        $(monodir)/mono/utils/libmonoutils.la \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) $(LIBICONV)
 
 CLASS=$(mcs_topdir)/class/lib/net_4_0
 

diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index 1aebdc8dc66dd9cc02a61a912dac388a7660c5e3..9b636ee1f7f541f7a21937c293f34047f48fdfb2 100644 (file)
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -19,6 +19,7 @@ monograph_LDADD = \
        $(runtime_lib)                  \
        $(GLIB_LIBS)                    \
        $(LLVM_LIBS)                    \
+       $(LIBICONV)                     \
        -lm
 
 GRAPHS=System.Object System.Enum System.Attribute System.ValueType System.Reflection.MemberInfo

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index a5a6a7710af04bf612dafba00acde8ef2eec71d8..bcf75924203e0059be5d3534cb825fa2515cea97 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -28,9 +28,9 @@ libmono_profiler_cov_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la
 libmono_profiler_aot_la_SOURCES = mono-profiler-aot.c
 libmono_profiler_aot_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la
 #libmono_profiler_logging_la_SOURCES = mono-profiler-logging.c
-#libmono_profiler_logging_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(GLIB_LIBS)
+#libmono_profiler_logging_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(GLIB_LIBS) $(LIBICONV)
 libmono_profiler_iomap_la_SOURCES = mono-profiler-iomap.c
-libmono_profiler_iomap_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(GLIB_LIBS)
+libmono_profiler_iomap_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(GLIB_LIBS) $(LIBICONV)
 libmono_profiler_log_la_SOURCES = proflog.c
 libmono_profiler_log_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(Z_LIBS)
 
@@ -56,5 +56,3 @@ check-local: testlog
 
 EXTRA_DIST=utils.c utils.h proflog.h log-profiler.txt perf_event.h \
        $(PLOG_TESTS_SRC) ptestrunner.pl
-
-

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index a423d3b67cfd80dfcf6331db4338c3627d88de68..ec71ecfe9c8f940f9eefbeec730503e427c6fcbe 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -927,6 +927,6 @@ else
 libtest_la_LDFLAGS = -rpath `pwd`
 endif
 libtest_la_SOURCES = libtest.c
-libtest_la_LIBADD = $(GLIB_LIBS)
+libtest_la_LIBADD = $(GLIB_LIBS) $(LIBICONV)
 
 CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) $(STRESS_TESTS) *.dll *.stdout *.aotlog *.exe stest.dat

diff --git a/tools/sgen/Makefile.am b/tools/sgen/Makefile.am
index a9fe192d6dcfe8a9bde7ed1502cabbe305f46540..cad05cb6efb59884676448059303f2c95c54b16d 100644 (file)
--- a/tools/sgen/Makefile.am
+++ b/tools/sgen/Makefile.am
@@ -6,4 +6,4 @@ sgen_grep_binprot_SOURCES = \
        sgen-grep-binprot.c
 
 sgen_grep_binprot_LDADD = \
-       $(GLIB_LIBS) 
+       $(GLIB_LIBS) $(LIBICONV)