From 05c031000c447ff01c8f23e1d0b5455a18b8dfc2 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 29 Jun 2017 14:26:16 -0400 Subject: [PATCH] Fix: Don't override user variables within the build system MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Instead use the appropriatly prefixed AM_* variables as to not interfere when a user variable is passed to a make command. The proper use of flag variables is documented at : https://www.gnu.org/software/automake/manual/automake.html#Flag-Variables-Ordering Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- .gitignore | 4 ++-- Makefile.am | 2 -- bindings/python/babeltrace/Makefile.am | 2 +- bindings/python/bt2/Makefile.am | 2 +- cli/Makefile.am | 3 +-- common/Makefile.am | 3 +-- compat/Makefile.am | 2 -- configure.ac | 20 ++++++++------------ lib/Makefile.am | 2 -- lib/ctf-ir/Makefile.am | 2 -- lib/ctf-writer/Makefile.am | 2 -- lib/graph/Makefile.am | 2 -- lib/graph/notification/Makefile.am | 2 -- lib/plugin/Makefile.am | 2 -- lib/prio_heap/Makefile.am | 2 -- logging/Makefile.am | 2 -- plugins/ctf/Makefile.am | 2 -- plugins/ctf/common/Makefile.am | 2 -- plugins/ctf/common/btr/Makefile.am | 2 -- plugins/ctf/common/metadata/Makefile.am | 6 ++---- plugins/ctf/common/notif-iter/Makefile.am | 3 --- plugins/ctf/fs-sink/Makefile.am | 2 +- plugins/ctf/fs-src/Makefile.am | 2 +- plugins/ctf/lttng-live/Makefile.am | 2 +- plugins/libctfcopytrace/Makefile.am | 2 -- plugins/lttng-utils/Makefile.am | 2 +- plugins/text/Makefile.am | 2 +- plugins/text/dmesg/Makefile.am | 2 +- plugins/text/pretty/Makefile.am | 2 +- plugins/utils/Makefile.am | 2 +- plugins/utils/counter/Makefile.am | 2 +- plugins/utils/dummy/Makefile.am | 2 +- plugins/utils/muxer/Makefile.am | 2 +- plugins/utils/trimmer/Makefile.am | 2 +- python-plugin-provider/Makefile.am | 2 +- tests/lib/Makefile.am | 2 +- tests/lib/test-plugin-plugins/Makefile.am | 2 -- tests/plugins/Makefile.am | 2 +- 38 files changed, 31 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index f738622d..89095e83 100644 --- a/.gitignore +++ b/.gitignore @@ -53,8 +53,8 @@ plugins/ctf/common/metadata/parser.h plugins/ctf/common/metadata/parser.output /cli/babeltrace /cli/babeltrace.bin -/config.h -/config.h.in +/include/config.h +/include/config.h.in /config.status *.log aclocal.m4 diff --git a/Makefile.am b/Makefile.am index 8099f48b..201c4a85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = include \ diff --git a/bindings/python/babeltrace/Makefile.am b/bindings/python/babeltrace/Makefile.am index cf56dfc7..b8ec41e4 100644 --- a/bindings/python/babeltrace/Makefile.am +++ b/bindings/python/babeltrace/Makefile.am @@ -9,7 +9,7 @@ all-local: $(INIT_PY) $(INIT_PY): $(INIT_PY_IN) sed "s/BABELTRACE_VERSION_STR/$(PACKAGE_VERSION)/g" < $< > $@ -AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ -I$(srcdir) +AM_CPPFLAGS += $(PYTHON_INCLUDE) -I$(srcdir) EXTRA_DIST = common.py reader.py writer.py $(INIT_PY_IN) $(NATIVEBT_I) nodist_btpackage_PYTHON = $(INIT_PY) $(NATIVEBT_PY) common.py reader.py writer.py diff --git a/bindings/python/bt2/Makefile.am b/bindings/python/bt2/Makefile.am index e2f01e60..4a96fdb3 100644 --- a/bindings/python/bt2/Makefile.am +++ b/bindings/python/bt2/Makefile.am @@ -66,7 +66,7 @@ $(NATIVE_MODULE_C): $(NATIVE_MODULE_I) $(NATIVE_MODULE_DEPS_I) # native_bt module _native_bt_la_SOURCES = native_bt_wrap.c _native_bt_la_LDFLAGS = -module -_native_bt_la_CFLAGS = $(GLIB_CFLAGS) $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ -I$(srcdir) +_native_bt_la_CFLAGS = $(GLIB_CFLAGS) $(PYTHON_INCLUDE) -I$(srcdir) $(AM_CFLAGS) _native_bt_la_LIBS = $(GLIB_LIBS) _native_bt_la_LIBADD = \ $(top_builddir)/lib/libbabeltrace.la \ diff --git a/cli/Makefile.am b/cli/Makefile.am index 5ceb499e..08d7252e 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -11,8 +11,7 @@ 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 babeltrace-log.bin diff --git a/common/Makefile.am b/common/Makefile.am index 4c902fa4..0584b1c8 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,5 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \ - -DINSTALL_LIBDIR=\"$(libdir)\" +AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\" noinst_LTLIBRARIES = libbabeltrace-common.la diff --git a/compat/Makefile.am b/compat/Makefile.am index ebd4e563..91a34842 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libcompat.la libcompat_la_SOURCES = compat_uuid.c \ diff --git a/configure.ac b/configure.ac index fe5a0efb..e9958cf2 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_INIT([babeltrace],bt_version,[jeremie dot galarneau at efficios dot com]) # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) @@ -22,7 +22,7 @@ AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace library extra AC_CANONICAL_TARGET AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc]) AM_MAINTAINER_MODE([enable]) # Enable silent rules if available (Introduced in AM 1.11) @@ -50,9 +50,6 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"], [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])]) AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])]) -LIBS="$PTHREAD_LIBS $LIBS" -CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -CC="$PTHREAD_CC" # Check linker option AX_APPEND_LINK_FLAGS([-Wl,--no-as-needed], [LD_NO_AS_NEEDED]) @@ -188,8 +185,6 @@ AC_CHECK_FUNCS([uuid_generate], # for libuuid, or uuid support in the C-library. PKG_CHECK_MODULES([UUID], [uuid], [ - LIBS="${UUID_LIBS} ${LIBS}" - CFLAGS="${CFLAGS} ${UUID_CFLAGS}" AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) link_with_libuuid=yes ], @@ -416,12 +411,13 @@ AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "VERBOSE" && test "$BABELTRACE_MI ]) AC_DEFINE_UNQUOTED([BT_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level]) -LIBS="$LIBS $GMODULE_LIBS" -PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat" -AC_SUBST(PACKAGE_CFLAGS) +AM_CFLAGS="-Wall -Wformat $PTHREAD_CFLAGS $GLIB_CFLAGS" +AC_SUBST(AM_CFLAGS) -DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/include -include config.h" -AC_SUBST(DEFAULT_INCLUDES) +AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h" +AC_SUBST(AM_CPPFLAGS) + +LIBS="$GLIB_LIBS" babeltraceincludedir="${includedir}/babeltrace" AC_SUBST(babeltraceincludedir) diff --git a/lib/Makefile.am b/lib/Makefile.am index 48a95c11..5ae2be42 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph . -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c diff --git a/lib/ctf-ir/Makefile.am b/lib/ctf-ir/Makefile.am index af63ae9f..ca59585b 100644 --- a/lib/ctf-ir/Makefile.am +++ b/lib/ctf-ir/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I. - noinst_LTLIBRARIES = libctf-ir.la libctf_ir_la_SOURCES = \ diff --git a/lib/ctf-writer/Makefile.am b/lib/ctf-writer/Makefile.am index 58b1f25b..9330141f 100644 --- a/lib/ctf-writer/Makefile.am +++ b/lib/ctf-writer/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libctf-writer.la libctf_writer_la_SOURCES = \ diff --git a/lib/graph/Makefile.am b/lib/graph/Makefile.am index 09bb1792..a3671a19 100644 --- a/lib/graph/Makefile.am +++ b/lib/graph/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - SUBDIRS = notification noinst_LTLIBRARIES = libgraph.la diff --git a/lib/graph/notification/Makefile.am b/lib/graph/notification/Makefile.am index 96560c10..61bd98af 100644 --- a/lib/graph/notification/Makefile.am +++ b/lib/graph/notification/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libgraph-notification.la libgraph_notification_la_SOURCES = \ diff --git a/lib/plugin/Makefile.am b/lib/plugin/Makefile.am index 467bbc52..bf8afa21 100644 --- a/lib/plugin/Makefile.am +++ b/lib/plugin/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libplugin.la # Plug-in system library diff --git a/lib/prio_heap/Makefile.am b/lib/prio_heap/Makefile.am index fffa43df..d1e23b0f 100644 --- a/lib/prio_heap/Makefile.am +++ b/lib/prio_heap/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libprio_heap.la libprio_heap_la_SOURCES = prio_heap.c diff --git a/logging/Makefile.am b/logging/Makefile.am index ef9077db..be2cc150 100644 --- a/logging/Makefile.am +++ b/logging/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libbabeltrace-logging.la libbabeltrace_logging_la_SOURCES = log.c diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am index c37eaf39..ab646a1b 100644 --- a/plugins/ctf/Makefile.am +++ b/plugins/ctf/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - SUBDIRS = common fs-src fs-sink lttng-live noinst_HEADERS = print.h diff --git a/plugins/ctf/common/Makefile.am b/plugins/ctf/common/Makefile.am index 63d77fc9..f40c22e1 100644 --- a/plugins/ctf/common/Makefile.am +++ b/plugins/ctf/common/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = btr notif-iter metadata -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-common.la libbabeltrace_plugin_ctf_common_la_SOURCES = print.h libbabeltrace_plugin_ctf_common_la_LIBADD = \ diff --git a/plugins/ctf/common/btr/Makefile.am b/plugins/ctf/common/btr/Makefile.am index 6d590d0c..ebddd68c 100644 --- a/plugins/ctf/common/btr/Makefile.am +++ b/plugins/ctf/common/btr/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = libctf-btr.la libctf_btr_la_SOURCES = \ btr.c \ diff --git a/plugins/ctf/common/metadata/Makefile.am b/plugins/ctf/common/metadata/Makefile.am index 0a490f3b..fa8b3418 100644 --- a/plugins/ctf/common/metadata/Makefile.am +++ b/plugins/ctf/common/metadata/Makefile.am @@ -1,5 +1,4 @@ -AM_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/include -I$(srcdir) -AM_CFLAGS = $(PACKAGE_CFLAGS) +AM_CPPFLAGS += -I$(builddir) -I$(srcdir) BUILT_SOURCES = parser.h parser.c lexer.c AM_YFLAGS = -t -d -v @@ -8,11 +7,10 @@ noinst_LTLIBRARIES = libctf-parser.la libctf-ast.la libctf_parser_la_SOURCES = lexer.l parser.y objstack.c # ctf-scanner-symbols.h is included to prefix generated yy_* symbols # with bt_. -libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) \ +libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) \ -include $(srcdir)/scanner-symbols.h libctf_parser_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-function -libctf_ast_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir) libctf_ast_la_SOURCES = \ visitor-generate-ir.c \ visitor-semantic-validator.c \ diff --git a/plugins/ctf/common/notif-iter/Makefile.am b/plugins/ctf/common/notif-iter/Makefile.am index e94454de..e29d92af 100644 --- a/plugins/ctf/common/notif-iter/Makefile.am +++ b/plugins/ctf/common/notif-iter/Makefile.am @@ -1,6 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -AM_CPPFLAGS = -I$(top_srcdir)/include - noinst_LTLIBRARIES = libctf-notif-iter.la libctf_notif_iter_la_SOURCES = \ diff --git a/plugins/ctf/fs-sink/Makefile.am b/plugins/ctf/fs-sink/Makefile.am index 56e0e17e..68c12aa5 100644 --- a/plugins/ctf/fs-sink/Makefile.am +++ b/plugins/ctf/fs-sink/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins \ +AM_CPPFLAGS += -I$(top_srcdir)/plugins \ -I$(top_srcdir)/plugins/libctfcopytrace noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-writer.la diff --git a/plugins/ctf/fs-src/Makefile.am b/plugins/ctf/fs-src/Makefile.am index c0ce4983..3f8ccf0a 100644 --- a/plugins/ctf/fs-src/Makefile.am +++ b/plugins/ctf/fs-src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-fs.la diff --git a/plugins/ctf/lttng-live/Makefile.am b/plugins/ctf/lttng-live/Makefile.am index 4fa0220d..3b40353e 100644 --- a/plugins/ctf/lttng-live/Makefile.am +++ b/plugins/ctf/lttng-live/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins libbabeltrace_plugin_ctf_lttng_live_la_SOURCES = lttng-live.c \ data-stream.c lttng-live-internal.h \ diff --git a/plugins/libctfcopytrace/Makefile.am b/plugins/libctfcopytrace/Makefile.am index cb6e9af4..6da83804 100644 --- a/plugins/libctfcopytrace/Makefile.am +++ b/plugins/libctfcopytrace/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - SUBDIRS = . noinst_LTLIBRARIES = libctfcopytrace.la diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am index 81d1c711..c1cac4fb 100644 --- a/plugins/lttng-utils/Makefile.am +++ b/plugins/lttng-utils/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins \ +AM_CPPFLAGS += -I$(top_srcdir)/plugins \ -I$(top_srcdir)/plugins/libctfcopytrace SUBDIRS = . diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am index 5261f988..ece30370 100644 --- a/plugins/text/Makefile.am +++ b/plugins/text/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins SUBDIRS = pretty dmesg . diff --git a/plugins/text/dmesg/Makefile.am b/plugins/text/dmesg/Makefile.am index d346b581..7e63cf72 100644 --- a/plugins/text/dmesg/Makefile.am +++ b/plugins/text/dmesg/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libbabeltrace-plugin-text-dmesg-cc.la diff --git a/plugins/text/pretty/Makefile.am b/plugins/text/pretty/Makefile.am index 4af26170..7d990aa0 100644 --- a/plugins/text/pretty/Makefile.am +++ b/plugins/text/pretty/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libbabeltrace-plugin-text-pretty-cc.la diff --git a/plugins/utils/Makefile.am b/plugins/utils/Makefile.am index e0b3094f..3592d274 100644 --- a/plugins/utils/Makefile.am +++ b/plugins/utils/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins SUBDIRS = dummy counter trimmer muxer . diff --git a/plugins/utils/counter/Makefile.am b/plugins/utils/counter/Makefile.am index d46bafe6..10cf5505 100644 --- a/plugins/utils/counter/Makefile.am +++ b/plugins/utils/counter/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libbabeltrace-plugin-counter-cc.la libbabeltrace_plugin_counter_cc_la_SOURCES = counter.c counter.h diff --git a/plugins/utils/dummy/Makefile.am b/plugins/utils/dummy/Makefile.am index 8be2676d..107f0feb 100644 --- a/plugins/utils/dummy/Makefile.am +++ b/plugins/utils/dummy/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libbabeltrace-plugin-dummy-cc.la libbabeltrace_plugin_dummy_cc_la_SOURCES = dummy.c dummy.h diff --git a/plugins/utils/muxer/Makefile.am b/plugins/utils/muxer/Makefile.am index 4c4f9d21..a85c8fbe 100644 --- a/plugins/utils/muxer/Makefile.am +++ b/plugins/utils/muxer/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins +AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libbabeltrace-plugin-muxer.la libbabeltrace_plugin_muxer_la_SOURCES = muxer.c muxer.h logging.c logging.h diff --git a/plugins/utils/trimmer/Makefile.am b/plugins/utils/trimmer/Makefile.am index 5e40a9a1..1fba28ce 100644 --- a/plugins/utils/trimmer/Makefile.am +++ b/plugins/utils/trimmer/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins \ +AM_CPPFLAGS += -I$(top_srcdir)/plugins \ -I$(top_srcdir)/plugins/libctfcopytrace noinst_LTLIBRARIES = libbabeltrace-plugin-trimmer.la diff --git a/python-plugin-provider/Makefile.am b/python-plugin-provider/Makefile.am index c4060cfd..3eb9a5ef 100644 --- a/python-plugin-provider/Makefile.am +++ b/python-plugin-provider/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PYTHON_INCLUDE) $(PACKAGE_CFLAGS) -I$(top_srcdir)/include +AM_CPPFLAGS += $(PYTHON_INCLUDE) lib_LTLIBRARIES = libbabeltrace-python-plugin-provider.la diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index ca5ffc3f..80cf9775 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = writer . -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la diff --git a/tests/lib/test-plugin-plugins/Makefile.am b/tests/lib/test-plugin-plugins/Makefile.am index 7e084c14..5bb34ca0 100644 --- a/tests/lib/test-plugin-plugins/Makefile.am +++ b/tests/lib/test-plugin-plugins/Makefile.am @@ -1,5 +1,3 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - noinst_LTLIBRARIES = plugin-minimal.la plugin-sfs.la # the minimal plugin diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index 200072c0..3516e424 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la COMMON_TEST_LDADD = $(LIBTAP) \ -- 2.34.1