[io-layer] Extract error (#4279)

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

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 284bdbdc71c71be1ba825ed8c39d144550c745d3..14090d8c3ecc5d60c50a5d2225e23b0a559b3e47 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -1,16 +1,32 @@
-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 SUPPORT_SGEN
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
+gc_lib=$(top_builddir)/mono/sgen/libmonosgen-static.la
 else
-runtime_lib=../interpreter/libmint.la
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
+gc_lib=$(LIBGC_STATIC_LIBS)
 endif
 
+runtime_lib=   \
+       $(metadata_lib) \
+       $(gc_lib)       \
+       $(top_builddir)/mono/utils/libmonoutils.la \
+       $(GLIB_LIBS) $(LIBICONV)
+
+if DISABLE_EXECUTABLES
+bin_PROGRAMS =
+else
+if DISABLE_LIBRARIES
+bin_PROGRAMS =
+else
 bin_PROGRAMS = monodis
+endif
+endif
 
 noinst_LIBRARIES = libmonodis.a
 
@@ -34,11 +50,12 @@ monodis_LDADD =                     \
        libmonodis.a                    \
        $(runtime_lib)                  \
        $(LLVM_LIBS)                    \
+       $(LLVM_LDFLAGS)                 \
        $(GLIB_LIBS)                    \
        $(LIBICONV)
 
 if PLATFORM_DARWIN
-monodis_LDFLAGS=-framework CoreFoundation
+monodis_LDFLAGS=-framework CoreFoundation -framework Foundation
 endif
 
 man_MANS = monodis.1