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

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 <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/.gitignore b/.gitignore
index f738622ddb3def09173220c35cbb97007bd04d8f..89095e831d284cce117dc83503702d642ed9790a 100644 (file)
--- 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 8099f48bda7b2375b6d6e2aa4feda9609169727b..201c4a85bc814ad8936341aa112e44ad05138a34 100644 (file)
--- 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 cf56dfc7f91a49ab827223a697e71ee66449a299..b8ec41e4fb156f092411cb61514f6bf212de3cab 100644 (file)
--- 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 e2f01e603c3f5e350fb52f9220ecd360435c184f..4a96fdb35b8b4735a01a4c89a1dafd98a4bca3fe 100644 (file)
--- 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 5ceb499e902fa8d4ab68ab61dd7aa0933270ea2a..08d7252e434f6bfc28fbee6e30a9e66e3c2cb91c 100644 (file)
--- 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 4c902fa482f12cb354f0260e799c33a4f807a7a9..0584b1c8076a1cfd4cf7ea2164ab449644a13b1d 100644 (file)
--- 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 ebd4e563685c9432a64e487027803e6124f35042..91a34842037a83d30ed5793c56191dc6983effb0 100644 (file)
--- 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 fe5a0efbcbde92325fb0452a4b05190de8f30a6d..e9958cf2ab3e3a72f828e77314a1e3e13f8b8fc7 100644 (file)
--- 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 48a95c11ca5983d75c06cfad1d92f21bf6295556..5ae2be4227cd16b1851b6bd64b34463a4ee1ffbf 100644 (file)
--- 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 af63ae9f85697e0db3849a73d1368affb4502ef2..ca59585b0389ec632b04121406116ad3ba3fce56 100644 (file)
--- 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 58b1f25bcf6dc32a94cb88405ba34eb4c63f57b9..9330141fc21f91c26b9ed2546b780807b354563a 100644 (file)
--- 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 09bb17926b20922d89d7868dae08d43a708f3814..a3671a1970c22d845810d7a56673c2b1e147c8ee 100644 (file)
--- 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 96560c10d49e52baf5f1fe60f1c5eb4f4ebe8073..61bd98af1daddbc5e405cd821bfe6da8ef9182e5 100644 (file)
--- 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 467bbc52d92f7adaef0e8ed6195cf2741958c68e..bf8afa213f7c6e48f65e70c0fc053d6e0fc61606 100644 (file)
--- 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 fffa43df9ffe65619c1cfd2aa282d671d174de0d..d1e23b0fc9c8dd00753d7ec5c8a8dd56de8f244e 100644 (file)
--- 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 ef9077dba5a41e36293aa4bae1950e50db81564e..be2cc1507e2c3700cc2f3e44ada743935a468bd9 100644 (file)
--- 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 c37eaf392a236e1132a858dc812d782e56101f15..ab646a1b3108c815916dd8d2bde41e0ffc0faa1b 100644 (file)
--- 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 63d77fc94a3c01b95812e63d4329022e342002ae..f40c22e1d4314f5b44032269401840a0453a11e1 100644 (file)
--- 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 6d590d0c7287284ed7168f2309dce80bab4cef72..ebddd68cc34ade2936d060a100a3c13287133208 100644 (file)
--- 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 0a490f3b652512a626fba7e8ff7306aff71131d5..fa8b34186f268e921bf7aa826f61679a60fa151a 100644 (file)
--- 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 e94454def7d668816e2c045af4ec8f3345a518aa..e29d92af469f0e0845b0c7e7b9da23108335c243 100644 (file)
--- 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 56e0e17e26ef7bb4211f6ab692aad9408487c89e..68c12aa576d182c670a9a95c98c7035b28a1c1ad 100644 (file)
--- 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 c0ce498327909bff2abd60adf49506a09807bd4a..3f8ccf0a9ffb8e23c11f94077bfa2f5dc5b7bed4 100644 (file)
--- 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 4fa0220da08fcc1b62fac3902c5d8dc42cf71ffa..3b40353e8fc39cb1d66fe7e2157e36a8c1083c69 100644 (file)
--- 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 cb6e9af420fdae6468d04250e4b4df1b46d25ec6..6da83804aee8363bb720173ccd0aaf14cb6138e4 100644 (file)
--- 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 81d1c711e1f7deb105c4c81c72deec8e1d551ee6..c1cac4fbc46d72faaf43c6ab99b15314944ef640 100644 (file)
--- 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 5261f98824afcb95a11cecf1ccee80432d3f5530..ece303707a1a150b15b1afe2046cf85ea402dec6 100644 (file)
--- 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 d346b581b9181908aa094b49259509f84d4ab7ef..7e63cf72a3217abdda11ba5c53a4cdc2b704486f 100644 (file)
--- 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 4af26170051e504151e1e5c4099c1355915998c4..7d990aa04e086929bfb2a4f9d7357f61088e7081 100644 (file)
--- 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 e0b3094f9dcf520c68d6aa433b758cd9584d0e92..3592d274b2599a0cb4c67bba2784a32827e2d0e9 100644 (file)
--- 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 d46bafe641690f4b940de85e8b503b69dce25aff..10cf55054f875d83c68f0a67bd7b4d0a236fab81 100644 (file)
--- 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 8be2676dc51175164a9f06da0c8af7fd4cbfe823..107f0feb774c2c5c90176a47ed619606df65950d 100644 (file)
--- 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 4c4f9d2128d60793b58774256b3b0b7c78f9132e..a85c8fbeec1999970fab19f9472a79f8669d9c1e 100644 (file)
--- 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 5e40a9a158898dadaa059617fa099aafa53f0a5b..1fba28cecb8b0b56c87a89578148d9c12ec1ec97 100644 (file)
--- 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 c4060cfd7a69a20f1e0b9e56d280cd87576e20e7..3eb9a5eff6296fb2fb09982158f048c41c590920 100644 (file)
--- 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 ca5ffc3f6b4d46552e7ba24317a42a47266beed5..80cf97750eec12b97c94ef547f0980f9a5d61ee4 100644 (file)
--- 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 7e084c14d17fc75ce55b3321c9a8fcf8c0772251..5bb34ca0f5eedfdd0f7230604b4fdb51306bc9a8 100644 (file)
--- 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 200072c09dc97566f6274444a50ffbc4b33c3297..3516e424218b45ec80f7143d40a762dd28e9f816 100644 (file)
--- 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) \