Merge pull request #409 from Alkarex/patch-1

[mono.git] / mono / dis / Makefile.am

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 05b82ec4747bb6b1dc8646ef8a8e9a478de16966..fd581ff5514d8c6a5cbe0dfb7a2b18098cae22a1 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -1,16 +1,37 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 if HOST_WIN32
 export HOST_CC
 endif
 
 if JIT_SUPPORTED
-runtime_lib=../mini/libmono-$(API_VER).la
+if !SHARED_MONO
+static_libs=   \
+       $(top_builddir)/mono/metadata/libmonoruntime-static.la  \
+       $(top_builddir)/mono/io-layer/libwapi.la        \
+       $(top_builddir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) $(LIBICONV) \
+       $(LIBGC_STATIC_LIBS)
+
+runtime_lib=../mini/$(LIBMONO_LA) $(static_libs)
+else
+runtime_lib=../mini/$(LIBMONO_LA)
+endif
 else
 runtime_lib=../interpreter/libmint.la
 endif
 
+if DISABLE_EXECUTABLES
+bin_PROGRAMS =
+else
+if DISABLE_LIBRARIES
+bin_PROGRAMS =
+else
+if SUPPORT_BOEHM
 bin_PROGRAMS = monodis
+endif
+endif
+endif
 
 noinst_LIBRARIES = libmonodis.a
 
@@ -34,7 +55,8 @@ monodis_LDADD =                       \
        libmonodis.a                    \
        $(runtime_lib)                  \
        $(LLVM_LIBS)                    \
-       $(GLIB_LIBS) 
+       $(GLIB_LIBS)                    \
+       $(LIBICONV)
 
 if PLATFORM_DARWIN
 monodis_LDFLAGS=-framework CoreFoundation