From 1deef5a760b37cf1e42a60110981d0f752d84d9d Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 26 Apr 2011 10:24:58 -0400 Subject: [PATCH] Make sure everything that links with eglib also links with libiconv --- eglib/test/Makefile.am | 2 +- mono/dis/Makefile.am | 3 ++- mono/interpreter/Makefile.am | 1 + mono/mini/Makefile.am | 10 +++++----- mono/monograph/Makefile.am | 1 + mono/profiler/Makefile.am | 6 ++---- mono/tests/Makefile.am | 2 +- tools/sgen/Makefile.am | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/eglib/test/Makefile.am b/eglib/test/Makefile.am index 39eb7b09194..dfa708025a3 100644 --- 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 05b82ec4747..284bdbdc71c 100644 --- 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 dc29d1530d6..4b21cbb2417 100644 --- 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 2b822522eb0..a271376e387 100644 --- 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 1aebdc8dc66..9b636ee1f7f 100644 --- 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 a5a6a7710af..bcf75924203 100644 --- 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 a423d3b67cf..ec71ecfe9c8 100644 --- 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 a9fe192d6dc..cad05cb6efb 100644 --- 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) -- 2.25.1