X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2FMakefile.am;h=fd581ff5514d8c6a5cbe0dfb7a2b18098cae22a1;hb=cca57fa576efc81ae7e83f53123b653d77959b1e;hp=0286fee0463e18d9b336b000f0d3ba2337fd3d10;hpb=c4a3b30460c7ea1a1fb3c97cfc8478555714af2f;p=mono.git

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 0286fee0463..fd581ff5514 100644
--- 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 PLATFORM_WIN32
+if HOST_WIN32
 export HOST_CC
 endif
 
 if JIT_SUPPORTED
-runtime_lib=../mini/libmono.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
 
@@ -33,8 +54,13 @@ monodis_SOURCES =	\
 monodis_LDADD = 			\
 	libmonodis.a			\
 	$(runtime_lib)			\
-	$(GMODULE_LIBS) 		\
-	$(GLIB_LIBS) 
+	$(LLVM_LIBS)			\
+	$(GLIB_LIBS)			\
+	$(LIBICONV)
+
+if PLATFORM_DARWIN
+monodis_LDFLAGS=-framework CoreFoundation
+endif
 
 man_MANS = monodis.1