X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2FMakefile.am;h=06085362c54484072e624443e2c11b6a9dc573c3;hb=b89b696e71fbcf94520cf70aeb636658951a50a6;hp=fcf17c001b9ffb9b531f6cec7ce17fa087fb3d8e;hpb=08014c462964a6fa03ca4ba609cd91e326b88dee;p=mono.git

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index fcf17c001b9..06085362c54 100644
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -6,17 +6,17 @@ endif
 
 if SUPPORT_SGEN
 metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
+gc_lib=$(top_builddir)/mono/sgen/libmonosgen-static.la
 else
-metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la
 gc_lib=$(LIBGC_STATIC_LIBS)
 endif
 
 runtime_lib=	\
-	../mini/$(LIBMONO_LA) \
-	$(top_builddir)/mono/io-layer/libwapi.la	\
+	$(metadata_lib) \
+	$(gc_lib)	\
 	$(top_builddir)/mono/utils/libmonoutils.la \
-	$(GLIB_LIBS) $(LIBICONV) \
-	$(gc_lib)
+	$(GLIB_LIBS) $(LIBICONV)
 
 if DISABLE_EXECUTABLES
 bin_PROGRAMS =
@@ -50,6 +50,7 @@ monodis_LDADD = 			\
 	libmonodis.a			\
 	$(runtime_lib)			\
 	$(LLVM_LIBS)			\
+	$(LLVM_LDFLAGS)			\
 	$(GLIB_LIBS)			\
 	$(LIBICONV)