projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3871 from akoeplinger/mono.posix-windows
[mono.git]
/
mono
/
dis
/
Makefile.am
diff --git
a/mono/dis/Makefile.am
b/mono/dis/Makefile.am
index 9c397f4e41bb1c6c689dc5efe2ee8404efc33aaa..40f0dbf95524a9372405cbce3eef665f45f8da8f 100644
(file)
--- a/
mono/dis/Makefile.am
+++ b/
mono/dis/Makefile.am
@@
-1,19
+1,30
@@
-
INCLUDE
S = $(GLIB_CFLAGS) -I$(top_srcdir)
+
AM_CPPFLAG
S = $(GLIB_CFLAGS) -I$(top_srcdir)
if HOST_WIN32
export HOST_CC
endif
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
else
-runtime_lib=../interpreter/libmint.la
+metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
+gc_lib=$(LIBGC_STATIC_LIBS)
endif
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 DISABLE_EXECUTABLES
bin_PROGRAMS =
else
-if SUPPORT_BOEHM
+if DISABLE_LIBRARIES
+bin_PROGRAMS =
+else
bin_PROGRAMS = monodis
endif
endif
bin_PROGRAMS = monodis
endif
endif
@@
-40,11
+51,12
@@
monodis_LDADD = \
libmonodis.a \
$(runtime_lib) \
$(LLVM_LIBS) \
libmonodis.a \
$(runtime_lib) \
$(LLVM_LIBS) \
+ $(LLVM_LDFLAGS) \
$(GLIB_LIBS) \
$(LIBICONV)
if PLATFORM_DARWIN
$(GLIB_LIBS) \
$(LIBICONV)
if PLATFORM_DARWIN
-monodis_LDFLAGS=-framework CoreFoundation
+monodis_LDFLAGS=-framework CoreFoundation
-framework Foundation
endif
man_MANS = monodis.1
endif
man_MANS = monodis.1