Revert "Avoid building the log profiler on windows, it has no libz."

[mono.git] / mono / profiler / Makefile.am

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 5bab64f8b5018be7c60adc09722751405cb0f686..f21235907c1cc4be61fab418d1d8023ad16523c7 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -1,17 +1,43 @@
+if HAVE_ZLIB
+Z_LIBS= -lz
+else
+Z_LIBS=
+endif
 
 INCLUDES = \
        -fexceptions -DMONO_USE_EXC_TABLES      \
        -I$(top_srcdir)         \
-       $(GMODULE_CFLAGS)               \
        $(GLIB_CFLAGS)
 
+if !DISABLE_PROFILER
 if JIT_SUPPORTED
+if PLATFORM_LINUX
+bin_PROGRAMS = mprof-report
+lib_LTLIBRARIES = libmono-profiler-cov.la libmono-profiler-aot.la libmono-profiler-logging.la libmono-profiler-iomap.la libmono-profiler-log.la
+else
+bin_PROGRAMS = mprof-report
+lib_LTLIBRARIES = libmono-profiler-cov.la libmono-profiler-aot.la libmono-profiler-iomap.la libmono-profiler-log.la
+endif
+endif
+endif
 
-lib_LTLIBRARIES = libmono-profiler-cov.la libmono-profiler-aot.la
+if HAVE_OPROFILE
+# Do something that uses OPROFILE_CFLAGS and OPROFILE_LIBS
 endif
 
 libmono_profiler_cov_la_SOURCES = mono-cov.c
-libmono_profiler_cov_la_LIBADD = $(top_builddir)/mono/mini/libmono.la
+libmono_profiler_cov_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la
 libmono_profiler_aot_la_SOURCES = mono-profiler-aot.c
-libmono_profiler_aot_la_LIBADD = $(top_builddir)/mono/mini/libmono.la
+libmono_profiler_aot_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la
+libmono_profiler_logging_la_SOURCES = mono-profiler-logging.c
+libmono_profiler_logging_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(GLIB_LIBS)
+libmono_profiler_iomap_la_SOURCES = mono-profiler-iomap.c
+libmono_profiler_iomap_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la
+libmono_profiler_log_la_SOURCES = proflog.c
+libmono_profiler_log_la_LIBADD = $(top_builddir)/mono/mini/libmono-$(API_VER).la $(Z_LIBS)
+
+mprof_report_SOURCES = decode.c
+mprof_report_LDADD = $(Z_LIBS)
+
+EXTRA_DIST=utils.c utils.h proflog.h log-profiler.txt