X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2FMakefile.am;h=40f0dbf95524a9372405cbce3eef665f45f8da8f;hb=57fc0b74391f3faa94f3c952dbce49fa22e666b2;hp=24fcd94f81b2ff0e05e950af183fccc0428d7d7f;hpb=62b8512f2b21f3d1381fb4e7ad2e6f3915996aa3;p=mono.git

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 24fcd94f81b..40f0dbf9552 100644
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -1,18 +1,33 @@
-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_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
 
-if SUPPORT_BOEHM
+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 DISABLE_LIBRARIES
+bin_PROGRAMS =
+else
 bin_PROGRAMS = monodis
 endif
+endif
 
 noinst_LIBRARIES = libmonodis.a
 
@@ -36,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