Fix: Don't override user variables within the build system

[babeltrace.git] / cli / Makefile.am

diff --git a/cli/Makefile.am b/cli/Makefile.am
index d5918366536e94434946dd2aabcae9ceb2ed3aff..08d7252e434f6bfc28fbee6e30a9e66e3c2cb91c 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -5,15 +5,17 @@ if ENABLE_DEBUG_INFO
 LTTNG_UTILS_PLUGIN_PATH += :$(PLUGINS_PATH)/lttng-utils
 endif
 
+if BABELTRACE_BUILD_WITH_MINGW
+IN_TREE_PLUGIN_PATH := $(shell cygpath -pm "$(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/utils$(LTTNG_UTILS_PLUGIN_PATH)")
+else
 IN_TREE_PLUGIN_PATH = $(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/utils$(LTTNG_UTILS_PLUGIN_PATH)
+endif
 
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
-               '-DCONFIG_IN_TREE_PLUGIN_PATH="$(IN_TREE_PLUGIN_PATH)"'
+AM_CPPFLAGS += '-DCONFIG_IN_TREE_PLUGIN_PATH="$(IN_TREE_PLUGIN_PATH)"'
 AM_LDFLAGS = -lpopt
 
-bin_PROGRAMS = babeltrace.bin
-noinst_PROGRAMS = babeltrace
-#check_PROGRAMS = babeltrace
+bin_PROGRAMS = babeltrace.bin babeltrace-log.bin
+noinst_PROGRAMS = babeltrace babeltrace-log
 
 babeltrace_bin_SOURCES = \
        babeltrace.c \
@@ -61,7 +63,7 @@ if BUILT_IN_PLUGINS
 # binary that are filled by plugin objects. If the linker discards those
 # symbols because the CLI does not use them directly, the CLI reports
 # no plugins found (plugins are effectively not embedded).
-pluginarchive = -Wl,--whole-archive,$(PLUGINS_PATH)/$(1)/.libs/libbabeltrace-plugin-$(1).a,--no-whole-archive
+pluginarchive = -Wl,--whole-archive,$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a,--no-whole-archive
 
 # Built-in plugins
 babeltrace_bin_LDFLAGS += $(call pluginarchive,ctf)
@@ -82,3 +84,16 @@ babeltrace_SOURCES = $(babeltrace_bin_SOURCES)
 babeltrace_LDFLAGS = $(babeltrace_bin_LDFLAGS)
 babeltrace_LDADD =     $(babeltrace_bin_LDADD)
 babeltrace_CFLAGS =    $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION
+
+# babeltrace-log rules and config below
+babeltrace_log_bin_SOURCES = babeltrace-log.c
+babeltrace_log_bin_LDADD = $(top_builddir)/compat/libcompat.la
+babeltrace_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace$(EXEEXT)"'
+
+if BABELTRACE_BUILD_WITH_MINGW
+babeltrace_log_bin_LDADD += -lpopt
+endif
+
+babeltrace_log_SOURCES = $(babeltrace_log_bin_SOURCES)
+babeltrace_log_LDADD =         $(babeltrace_log_bin_LDADD)
+babeltrace_log_CFLAGS =        $(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace$(EXEEXT)"'