X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2FMakefile.am;h=40f0dbf95524a9372405cbce3eef665f45f8da8f;hb=9006b7ac98b2c13df0525be65cb7022c5d3d9383;hp=1fa0c43e8b0f781fee5c53b0a86442a30a166357;hpb=4a8ffc802392458d3d9f6ce8ceaa2914eb8395ca;p=mono.git

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 1fa0c43e8b0..40f0dbf9552 100644
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -1,30 +1,30 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 if HOST_WIN32
 export HOST_CC
 endif
 
-if JIT_SUPPORTED
-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
+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/io-layer/libwapi.la	\
+	$(top_builddir)/mono/utils/libmonoutils.la \
+	$(GLIB_LIBS) $(LIBICONV)
+
 if DISABLE_EXECUTABLES
 bin_PROGRAMS =
 else
-if SUPPORT_BOEHM
+if DISABLE_LIBRARIES
+bin_PROGRAMS =
+else
 bin_PROGRAMS = monodis
 endif
 endif
@@ -51,11 +51,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