diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/mono-hang-watchdog/Makefile.am | 7 | ||||
-rw-r--r-- | tools/pedump/Makefile.am | 28 | ||||
-rw-r--r-- | tools/sgen/Makefile.am | 8 |
3 files changed, 43 insertions, 0 deletions
diff --git a/tools/mono-hang-watchdog/Makefile.am b/tools/mono-hang-watchdog/Makefile.am index 596c7cd63e4..63a96c5f42b 100644 --- a/tools/mono-hang-watchdog/Makefile.am +++ b/tools/mono-hang-watchdog/Makefile.am @@ -1,3 +1,4 @@ +if !ENABLE_MSVC_ONLY AM_CPPFLAGS = $(SHARED_CFLAGS) @@ -7,6 +8,12 @@ else bin_PROGRAMS = mono-hang-watchdog endif +endif # !ENABLE_MSVC_ONLY + CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@) +if !ENABLE_MSVC_ONLY + mono_hang_watchdog_SOURCES = mono-hang-watchdog.c + +endif # !ENABLE_MSVC_ONLY diff --git a/tools/pedump/Makefile.am b/tools/pedump/Makefile.am index f45fce5b1e1..d05b053f848 100644 --- a/tools/pedump/Makefile.am +++ b/tools/pedump/Makefile.am @@ -1,3 +1,4 @@ +if !ENABLE_MSVC_ONLY AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS) @@ -16,7 +17,12 @@ endif endif endif +endif # !ENABLE_MSVC_ONLY + CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@) + +if !ENABLE_MSVC_ONLY + libpedump_a_CFLAGS = @CXX_ADD_CFLAGS@ pedump_SOURCES = @@ -34,6 +40,28 @@ if HOST_DARWIN pedump_LDFLAGS=-framework CoreFoundation -framework Foundation endif +endif # !ENABLE_MSVC_ONLY + +if ENABLE_MSVC_ONLY + +if SUPPORT_SGEN +mono_bin_suffix = sgen +else +mono_bin_suffix = +endif + +all-local: + + make -C $(top_srcdir)/msvc pedump + cp -f $(mono_msvc_build_bin_dir)/pedump-$(mono_bin_suffix)$(EXEEXT) ./pedump$(EXEEXT) + +clean-local: + + make -C $(top_srcdir)/msvc clean-pedump + rm ./pedump$(EXEEXT) + +endif # ENABLE_MSVC_ONLY + #Helper target to rebuild metadata as well, it's useful when working on the verifier as its source still on metadata md: make -C ../../mono/metadata all diff --git a/tools/sgen/Makefile.am b/tools/sgen/Makefile.am index bcc2105051a..594ba33478d 100644 --- a/tools/sgen/Makefile.am +++ b/tools/sgen/Makefile.am @@ -1,3 +1,5 @@ +if !ENABLE_MSVC_ONLY + bin_PROGRAMS = sgen-grep-binprot AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @@ -9,10 +11,14 @@ noinst_LIBRARIES = libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep # Main is in a library so it can be C++. noinst_LIBRARIES += libmain.a +endif # !ENABLE_MSVC_ONLY + # Default to C so the executable is linked as C and does not use libstdc++. # Also the -xc++ flag mishandles .o and .a files. CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@) +if !ENABLE_MSVC_ONLY + # Libraries are C++ if enabled. libmain_a_CFLAGS = @CXX_ADD_CFLAGS@ libsgen_grep_binprot_a_CFLAGS = @CXX_ADD_CFLAGS@ @@ -39,3 +45,5 @@ sgen_grep_binprot_LDADD = \ libmain_a-sgen-grep-binprot-main.$(OBJEXT) \ libmain_a-sgen-entry-stream.$(OBJEXT) \ $(glib_libs) libsgen-grep-binprot.a libsgen-grep-binprot32p.a libsgen-grep-binprot64p.a + +endif # !ENABLE_MSVC_ONLY |