Port: plugin system compat for mingw / macOS

[babeltrace.git] / cli / Makefile.am

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 5f07bf19b7c17543d5a5c58c4270dcfd093a4197..197aa5d7085e7ac89dac2d259c80229daa8a3b52 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -5,7 +5,11 @@ 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)"'
@@ -25,12 +29,12 @@ babeltrace_bin_SOURCES = \
        babeltrace-cfg-cli-args-connect.h \
        babeltrace-cfg-cli-args-default.h \
        babeltrace-cfg-cli-args-default.c \
-       logging.h
+       logging.c logging.h
 
 # -Wl,--no-as-needed is needed for recent gold linker who seems to think
 # it knows better and considers libraries with constructors having
 # side-effects as dead code.
-babeltrace_bin_LDFLAGS = $(LD_NO_AS_NEEDED) -Wl,-export-dynamic
+babeltrace_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
 
 # Add all the convenience libraries used by Babeltrace plugins and the
 # library. They will be used when embedding plugins (BUILT_IN_PLUGINS),
@@ -74,7 +78,7 @@ endif
 endif
 
 if BABELTRACE_BUILD_WITH_MINGW
-babeltrace_bin_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+babeltrace_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
 endif
 
 # Only used for in-tree execution and tests