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 eb781239cd341cc9da1a58f0579eaad46acf07f7..108dc1c7e468f3517a49bf8d655da700645aff1d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,7 @@ gen-events-time
 gen-events
 gen-ust-events
 health_check
+/tests/regression/kernel/select_poll_epoll
 /tests/regression/tools/mi/extract_xml
 /tests/regression/tools/mi/validate_xml
 /tests/regression/tools/notification/base_client
@@ -98,7 +99,7 @@ health_check
 /tests/regression/ust/fork/fork
 /tests/regression/ust/fork/fork2
 /tests/regression/ust/libc-wrapper/prog
-tests/regression/ust/python-logging/test_python_logging
+/tests/regression/ust/python-logging/test_python_logging
 /tests/regression/ust/baddr-statedump/prog
 /tests/regression/ust/baddr-statedump/prog.debug
 /tests/regression/ust/baddr-statedump/prog.strip
@@ -106,12 +107,16 @@ tests/regression/ust/python-logging/test_python_logging
 /tests/regression/ust/ust-dl/prog
 /tests/regression/ust/ust-dl/libfoo.so.debug
 /tests/regression/ust/ust-dl/libbar.so.debug
+/tests/regression/ust/ust-dl/libzzz.so.debug
 /tests/utils/testapp/gen-ust-nevents/gen-ust-nevents
 /tests/utils/testapp/gen-ust-tracef/gen-ust-tracef
 /tests/regression/tools/live/live_test
 /tests/unit/ini_config/ini_config
 /tests/perf/find_event
 /tests/perf/test_perf_raw
+/tests/regression/1
+/tests/unit/test_string_utils
+/tests/utils/testapp/gen-ust-nevents-str/gen-ust-nevents-str
 
 # man pages
 /doc/man/*.1

diff --git a/configure.ac b/configure.ac
index 2fa4e96a14fba24e03d54be85cc2eecc96a65ab2..6ac21349761af0d7b89c8a4ea1357151baa89853 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax nostdinc])
 AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules if available (Introduced in AM 1.11)
@@ -59,9 +59,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"
 
 AX_LIB_SOCKET_NSL
 
@@ -421,7 +418,7 @@ AC_ARG_WITH(kmod-prefix,
                [Specify the installation prefix of the kmod library.
                Headers must be in PATH/include; libraries in PATH/lib.]),
                [
-                       CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                       AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
                        LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
                ])
 
@@ -446,7 +443,7 @@ AC_ARG_WITH(lttng-ust-prefix,
                  [Specify the installation prefix of the lttng-ust library.
                  Headers must be in PATH/include; libraries in PATH/lib.]),
                  [
-                   CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                   AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
                    LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
                  ])
 
@@ -975,9 +972,11 @@ modify their sources.
 # export flex condition
 AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
 
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
+AC_SUBST(AM_CFLAGS)
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+AC_SUBST(AM_CPPFLAGS)
 
 lttngincludedir="${includedir}/lttng"
 AC_SUBST(lttngincludedir)
@@ -994,8 +993,6 @@ AC_SUBST(lttngnotificationincludedir)
 lttngtriggerincludedir="${includedir}/lttng/trigger"
 AC_SUBST(lttngtriggerincludedir)
 
-AC_SUBST(DEFAULT_INCLUDES)
-
 lttnglibexecdir="${libdir}/lttng/libexec"
 AC_SUBST(lttnglibexecdir)
 

diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am
index af1daf87c1f2fc8a7e839945e6ade224586ac404..25f0a4395d18089838e634e2d35c0771fae66ae9 100644 (file)
--- a/extras/bindings/swig/python/Makefile.am
+++ b/extras/bindings/swig/python/Makefile.am
@@ -1,7 +1,7 @@
 lttng.i: lttng.i.in
        $(SED) "s/LTTNG_VERSION_STR/LTTng $(PACKAGE_VERSION)/g" < $(srcdir)/lttng.i.in >lttng.i
 
-AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include
+AM_CPPFLAGS += $(PYTHON_INCLUDE)
 
 EXTRA_DIST = lttng.i.in
 nodist_python_PYTHON = lttng.py

diff --git a/extras/core-handler/Makefile.am b/extras/core-handler/Makefile.am
index eaa6b16c58c35078441845bd28ebbff1c2e7b8cc..63ee13bb017ae7aedc8440295269c668a6f9ff61 100644 (file)
--- a/extras/core-handler/Makefile.am
+++ b/extras/core-handler/Makefile.am
@@ -1,6 +1,3 @@
-AM_CFLAGS = -O2 -g
-AM_LDFLAGS =
-
 noinst_PROGRAMS = crash
 crash_SOURCES = crash.c
 

diff --git a/src/bin/lttng-consumerd/Makefile.am b/src/bin/lttng-consumerd/Makefile.am
index b7401de88c30a2a3c2d9401557f4ef923f4e4410..9d54309cf1b85751be5810007ad5ee3fc3f40322 100644 (file)
--- a/src/bin/lttng-consumerd/Makefile.am
+++ b/src/bin/lttng-consumerd/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 lttnglibexec_PROGRAMS = lttng-consumerd
 
 lttng_consumerd_SOURCES = lttng-consumerd.c \

diff --git a/src/bin/lttng-crash/Makefile.am b/src/bin/lttng-crash/Makefile.am
index ae4776f7e086b23efc5ed2652fd38608f14a8658..2b61ec2632b47c2017cf504f0f7c9de6b14fced9 100644 (file)
--- a/src/bin/lttng-crash/Makefile.am
+++ b/src/bin/lttng-crash/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-                         -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(bindir)"\"
 
 if EMBED_HELP
 AM_CPPFLAGS += -I$(top_builddir)/doc/man

diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am
index 31859b564cba54be4b3ff2c882d50e283b3a2923..c7dd37e1ae5e356f7bcec2082665a4d1f21bacbb 100644 (file)
--- a/src/bin/lttng-relayd/Makefile.am
+++ b/src/bin/lttng-relayd/Makefile.am
@@ -1,13 +1,10 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-                         -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
-                         -DINSTALL_LIB_PATH=\""$(libdir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+       -DINSTALL_LIB_PATH=\""$(libdir)"\"
 
 if EMBED_HELP
 AM_CPPFLAGS += -I$(top_builddir)/doc/man
 endif
 
-AM_CFLAGS = -fno-strict-aliasing
-
 bin_PROGRAMS = lttng-relayd
 
 lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index 4b4e7ec996e15ccde73276b1a4a51ddb58f72525..529887b8a75ae12a6e2f4542550cca5d3aa680f2 100644 (file)
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -1,13 +1,10 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-                         -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
-                         -DINSTALL_LIB_PATH=\""$(libdir)"\"
+AM_CPPFLAGS +=-DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+       -DINSTALL_LIB_PATH=\""$(libdir)"\"
 
 if EMBED_HELP
 AM_CPPFLAGS += -I$(top_builddir)/doc/man
 endif
 
-AM_CFLAGS = -fno-strict-aliasing
-
 bin_PROGRAMS = lttng-sessiond
 
 lttng_sessiond_SOURCES = utils.c utils.h \

diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am
index c60c0ee6d080661be0aec2bedc225b3620734b77..c1c2cf6f9b55fe98297837e5f3271db9a18ec7bf 100644 (file)
--- a/src/bin/lttng/Makefile.am
+++ b/src/bin/lttng/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-                         -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(bindir)"\"
 
 if EMBED_HELP
 AM_CPPFLAGS += -I$(top_builddir)/doc/man

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 0c001fd9e7fb0cb0a4510858c1c8b78a311c03d1..97a36b31109a57c70217533ba05a646ac2f9df52 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -26,7 +26,7 @@
 #include <inttypes.h>
 #include <ctype.h>
 
-#include <src/common/sessiond-comm/sessiond-comm.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 #include <common/compat/string.h>
 #include <common/string-utils/string-utils.h>
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index bdba28f19f2fadcc851babfa11ef950a2d3ae518..3b50777791579252fb2de7e92bf27039f80fdbba 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = string-utils
@@ -58,8 +56,6 @@ if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
 
-AM_CFLAGS = -fno-strict-aliasing
-
 noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
                                 uri.h utils.h lttng-kernel-old.h \
                                 align.h bitfield.h bug.h time.h

diff --git a/src/common/compat/Makefile.am b/src/common/compat/Makefile.am
index 2d2b02a0d5c8dee442831283532b77f758f3b1cc..c5418baebec2c738ccc3448c285246b642e7e227 100644 (file)
--- a/src/common/compat/Makefile.am
+++ b/src/common/compat/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libcompat.la
 
 if COMPAT_EPOLL

diff --git a/src/common/config/Makefile.am b/src/common/config/Makefile.am
index afc83f26f377b01e29f37f44fdbd69a658fa0df6..dbb47b818cc0b654af11b76fea23d5fc8075ca8e 100644 (file)
--- a/src/common/config/Makefile.am
+++ b/src/common/config/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libconfig.la
 
 libconfig_la_SOURCES = ini.c ini.h session-config.c session-config.h \

diff --git a/src/common/consumer/Makefile.am b/src/common/consumer/Makefile.am
index 029fb1d68354d09b0f966e96a22cd8085bdf3918..c628312892c1b6adf44632659493f712f53a97a9 100644 (file)
--- a/src/common/consumer/Makefile.am
+++ b/src/common/consumer/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 # Consumer library
 noinst_LTLIBRARIES = libconsumer.la
 

diff --git a/src/common/daemonize.c b/src/common/daemonize.c
index b12194ee9480c9aab2933258c987a9adff126100..88ec9f13472a88aba1f49ae07a97ced16806b5dd 100644 (file)
--- a/src/common/daemonize.c
+++ b/src/common/daemonize.c
@@ -25,8 +25,8 @@
 
 #include <urcu/system.h>
 
-#include <src/common/daemonize.h>
-#include <src/common/error.h>
+#include <common/daemonize.h>
+#include <common/error.h>
 
 LTTNG_HIDDEN
 int lttng_daemonize(pid_t *child_ppid, int *completion_flag,

diff --git a/src/common/defaults.h b/src/common/defaults.h
index e0d0d86dccb577eceb6133147567ec84f6d8a664..1e6a1171d14fb44a5eafa2fe8f80558fb16e6fa3 100644 (file)
--- a/src/common/defaults.h
+++ b/src/common/defaults.h
@@ -21,7 +21,7 @@
 #define _DEFAULTS_H
 
 #include <pthread.h>
-#include <src/common/macros.h>
+#include <common/macros.h>
 
 /* Default unix group name for tracing. */
 #define DEFAULT_TRACING_GROUP                   "tracing"

diff --git a/src/common/hashtable/Makefile.am b/src/common/hashtable/Makefile.am
index 765f64953ef841389adf2b8b87a58bf24c6ad146..000afd05d10e393710763205206e2b9243dfbe50 100644 (file)
--- a/src/common/hashtable/Makefile.am
+++ b/src/common/hashtable/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libhashtable.la
 
 libhashtable_la_SOURCES = hashtable.c hashtable.h \

diff --git a/src/common/health/Makefile.am b/src/common/health/Makefile.am
index d82f9de9ecf33bcf5b30d73e45c17311bb48139d..727c2f900c472f9f61b1a6513af37972e29470bb 100644 (file)
--- a/src/common/health/Makefile.am
+++ b/src/common/health/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libhealth.la
 
 libhealth_la_SOURCES = health.c

diff --git a/src/common/index/Makefile.am b/src/common/index/Makefile.am
index 054b0aa54bb9457e50cd4236dcaf8f0831606723..ee73ea2ca31ecc79b9f902b36b4b66e7c9d79ec1 100644 (file)
--- a/src/common/index/Makefile.am
+++ b/src/common/index/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libindex.la
 
 libindex_la_SOURCES = index.c index.h ctf-index.h

diff --git a/src/common/kernel-consumer/Makefile.am b/src/common/kernel-consumer/Makefile.am
index ed5462a6597fa50999bea7a216dd562b9087fef5..008041e1d8064b7669def0d28a3a950ab11a502a 100644 (file)
--- a/src/common/kernel-consumer/Makefile.am
+++ b/src/common/kernel-consumer/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 # Kernel consumer library
 noinst_LTLIBRARIES = libkernel-consumer.la
 

diff --git a/src/common/kernel-ctl/Makefile.am b/src/common/kernel-ctl/Makefile.am
index ab057dd3618b8abada4f04e8baf4d589d28f3734..0766499f5196b2d4e1660d07ce86d24107012a79 100644 (file)
--- a/src/common/kernel-ctl/Makefile.am
+++ b/src/common/kernel-ctl/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libkernel-ctl.la
 
 libkernel_ctl_la_SOURCES = kernel-ctl.c kernel-ctl.h kernel-ioctl.h

diff --git a/src/common/relayd/Makefile.am b/src/common/relayd/Makefile.am
index 274da87be1cea48b1dade25d286616f6bf7fb068..84eee1b8e59748310e3c11d9ffcbb0239b0580ff 100644 (file)
--- a/src/common/relayd/Makefile.am
+++ b/src/common/relayd/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 # Relayd library
 noinst_LTLIBRARIES = librelayd.la
 

diff --git a/src/common/sessiond-comm/Makefile.am b/src/common/sessiond-comm/Makefile.am
index 8f0a839b611416bbeb9313527398990fcd36992b..501746a2c93f33c1794f7ca31bcf9c896cb8d416 100644 (file)
--- a/src/common/sessiond-comm/Makefile.am
+++ b/src/common/sessiond-comm/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 # Session daemon communication lib
 noinst_LTLIBRARIES = libsessiond-comm.la
 

diff --git a/src/common/string-utils/Makefile.am b/src/common/string-utils/Makefile.am
index bbdb4ed2ce8ccd8d75a8b62a96363a7baacc0b73..1910042d649df3cdbff9f345a64376e21a41977a 100644 (file)
--- a/src/common/string-utils/Makefile.am
+++ b/src/common/string-utils/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libstring-utils.la
 
 libstring_utils_la_SOURCES = string-utils.h string-utils.c

diff --git a/src/common/testpoint/Makefile.am b/src/common/testpoint/Makefile.am
index 7d3df162f84c1e5b8e23218f1937e2fa05b5e399..5c15725eb56741acf6c94d8f3a642a31ea1d877d 100644 (file)
--- a/src/common/testpoint/Makefile.am
+++ b/src/common/testpoint/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS =
-
 noinst_LTLIBRARIES = libtestpoint.la
 
 libtestpoint_la_SOURCES = testpoint.h testpoint.c

diff --git a/src/common/ust-consumer/Makefile.am b/src/common/ust-consumer/Makefile.am
index ab8d38add5fc1fe5b3608ceee8446c9cfce4e7a0..1acdc7f12f3a49f9f9aa38cca9b8630951d6b6f4 100644 (file)
--- a/src/common/ust-consumer/Makefile.am
+++ b/src/common/ust-consumer/Makefile.am
@@ -1,7 +1,5 @@
 if HAVE_LIBLTTNG_UST_CTL
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_LTLIBRARIES = libust-consumer.la
 
 libust_consumer_la_SOURCES = ust-consumer.c ust-consumer.h

diff --git a/src/lib/lttng-ctl/Makefile.am b/src/lib/lttng-ctl/Makefile.am
index b5156caf94aa9320a2712a7525a5138bff1b4b74..03c073c9d74261dc5d363e8a562737cc8c82d04f 100644 (file)
--- a/src/lib/lttng-ctl/Makefile.am
+++ b/src/lib/lttng-ctl/Makefile.am
@@ -1,7 +1,7 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(builddir)
-
 SUBDIRS = filter
 
+AM_CPPFLAGS += -I$(srcdir) -I$(builddir)
+
 lib_LTLIBRARIES = liblttng-ctl.la
 
 liblttng_ctl_la_SOURCES = lttng-ctl.c snapshot.c lttng-ctl-helper.h \

diff --git a/src/lib/lttng-ctl/filter/Makefile.am b/src/lib/lttng-ctl/filter/Makefile.am
index 2c0d748800c14b96805cceb456e13a6050400db9..e338eee6e40d9cf4f79ba06f3c7dfa7454cd0604 100644 (file)
--- a/src/lib/lttng-ctl/filter/Makefile.am
+++ b/src/lib/lttng-ctl/filter/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-                         -I$(srcdir) -I$(builddir)
+AM_CPPFLAGS += -I$(srcdir) -I$(builddir)
 
 noinst_PROGRAMS = filter-grammar-test
 noinst_LTLIBRARIES = libfilter.la
@@ -22,7 +21,7 @@ libfilter_la_SOURCES = \
        filter-bytecode.h \
        filter-ir.h \
        memstream.h
-libfilter_la_CFLAGS = -include filter-symbols.h
+libfilter_la_CFLAGS = -include filter-symbols.h $(AM_CFLAGS)
 libfilter_la_LIBADD = $(top_builddir)/src/common/string-utils/libstring-utils.la
 
 AM_YFLAGS = -t -d -v

diff --git a/tests/regression/kernel/Makefile.am b/tests/regression/kernel/Makefile.am
index e9ec04ea9593dbfbc61005859a7ea4ff4573c997..92c21bc9fb13413db5d80d8db23e3a7e00e1f9e7 100644 (file)
--- a/tests/regression/kernel/Makefile.am
+++ b/tests/regression/kernel/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 EXTRA_DIST = test_event_basic test_all_events test_syscall \
                test_clock_override test_rotation_destroy_flush \
                test_select_poll_epoll
@@ -6,7 +5,7 @@ EXTRA_DIST = test_event_basic test_all_events test_syscall \
 noinst_PROGRAMS = select_poll_epoll
 select_poll_epoll_SOURCES = select_poll_epoll.c
 select_poll_epoll_LDADD = -lpthread -lpopt
-select_poll_epoll_CFLAGS = -fno-stack-protector -D_FORTIFY_SOURCE=0
+select_poll_epoll_CFLAGS = -fno-stack-protector -D_FORTIFY_SOURCE=0 $(AM_CFLAGS)
 
 all-local:
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \

diff --git a/tests/regression/tools/crash/Makefile.am b/tests/regression/tools/crash/Makefile.am
index 627a478383598a44272c671a8650f5d0f92951c7..5cfca6527bda1aea5d64c86de6ba314081630a38 100644 (file)
--- a/tests/regression/tools/crash/Makefile.am
+++ b/tests/regression/tools/crash/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
 noinst_SCRIPTS = test_crash
 EXTRA_DIST = test_crash
 

diff --git a/tests/regression/tools/filtering/Makefile.am b/tests/regression/tools/filtering/Makefile.am
index f96ac89bdc6728786ea15ebce089409bd0e6d4b1..712edefb63c7cec039a475e9882071c1ea13a7bc 100644 (file)
--- a/tests/regression/tools/filtering/Makefile.am
+++ b/tests/regression/tools/filtering/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -I$(srcdir) -O2 -g
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/tools/health/Makefile.am b/tests/regression/tools/health/Makefile.am
index 4d835f3dfa4d360fe4b4538de2679197a97af519..3cb2936ccf401c0934da0ff22b877cf7f1d5e377 100644 (file)
--- a/tests/regression/tools/health/Makefile.am
+++ b/tests/regression/tools/health/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I. -O2 -g -I$(top_srcdir)/include
-AM_LDFLAGS =
+AM_CPPFLAGS += -I. -I$(top_srcdir)/include
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am
index 8bc213d7ccab107650ba588b82e3f1b83892c517..44e4490102a7273a66d44c3e1aafca06a48b1e3a 100644 (file)
--- a/tests/regression/tools/live/Makefile.am
+++ b/tests/regression/tools/live/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/tools/mi/Makefile.am b/tests/regression/tools/mi/Makefile.am
index f26efe0d0eec43160fd61de204f3500c6f8be410..b1b28f4a7283b3e403a02c75ea011aaeaf03b653 100644 (file)
--- a/tests/regression/tools/mi/Makefile.am
+++ b/tests/regression/tools/mi/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 noinst_PROGRAMS = validate_xml extract_xml
 validate_xml_SOURCES = validate_xml.c
 validate_xml_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS)

diff --git a/tests/regression/tools/wildcard/Makefile.am b/tests/regression/tools/wildcard/Makefile.am
index b95b495e46ecc55b09a450429dc102abc6acb097..1261baa386b4db3a4396ca6e79763749c96e508f 100644 (file)
--- a/tests/regression/tools/wildcard/Makefile.am
+++ b/tests/regression/tools/wildcard/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -I$(srcdir) -O2 -g
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am
index 7caf457661a38471037d49ede663d9840f297824..bf32717978734c3d5ade23f6be245a85f4775ab4 100644 (file)
--- a/tests/regression/ust/baddr-statedump/Makefile.am
+++ b/tests/regression/ust/baddr-statedump/Makefile.am
@@ -2,7 +2,7 @@ objcopy_verbose = $(objcopy_verbose_@AM_V@)
 objcopy_verbose_ = $(objcopy_verbose_@AM_DEFAULT_V@)
 objcopy_verbose_0 = @echo OBJCOPY $@;
 
-AM_CPPFLAGS = -I$(srcdir) -g
+AM_CPPFLAGS += -I$(srcdir) -g
 
 noinst_PROGRAMS = prog
 prog_SOURCES = prog.c tp.c tp.h

diff --git a/tests/regression/ust/clock-override/Makefile.am b/tests/regression/ust/clock-override/Makefile.am
index 2a226303aa7d36c4455ce4ad5c9477dcf0b4b911..8559ef02e1f5c2a39bc4401537527491cdc98f18 100644 (file)
--- a/tests/regression/ust/clock-override/Makefile.am
+++ b/tests/regression/ust/clock-override/Makefile.am
@@ -9,8 +9,6 @@ EXTRA_DIST = test_clock_override lttng-ust-clock-override-test.c
 
 else
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src
-
 # The rpath is necessary because libtool won't build a shared library
 # if it's noinst_
 GETCPU_LIBTOOL_FLAGS = \

diff --git a/tests/regression/ust/daemon/Makefile.am b/tests/regression/ust/daemon/Makefile.am
index 76a34ef07eb7cb41a4919dd0eb6ebfd1bd963e45..cc63b63b744c1b45b589bad8bfcde31d4c5daf46 100644 (file)
--- a/tests/regression/ust/daemon/Makefile.am
+++ b/tests/regression/ust/daemon/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 noinst_PROGRAMS = daemon
 daemon_SOURCES = daemon.c ust_tests_daemon.h

diff --git a/tests/regression/ust/exit-fast/Makefile.am b/tests/regression/ust/exit-fast/Makefile.am
index 539803d7beb82fcd995345cd88867d03211847bd..4424b0d20f16d83d29eb05e14b3ee37daa0035d0 100644 (file)
--- a/tests/regression/ust/exit-fast/Makefile.am
+++ b/tests/regression/ust/exit-fast/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 noinst_PROGRAMS = exit-fast
 exit_fast_SOURCES = exit-fast.c ust_tests_exitfast.h

diff --git a/tests/regression/ust/fork/Makefile.am b/tests/regression/ust/fork/Makefile.am
index 89a2ec985e972848cf51ae80376340c8c8d6bfea..b07cf9dba0cbadb233c7f85ac2ea17fc0cedb627 100644 (file)
--- a/tests/regression/ust/fork/Makefile.am
+++ b/tests/regression/ust/fork/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 noinst_PROGRAMS = fork fork2
 fork_SOURCES = fork.c ust_tests_fork.h

diff --git a/tests/regression/ust/getcpu-override/Makefile.am b/tests/regression/ust/getcpu-override/Makefile.am
index 21076e134e54c88e0f998fef29a735e07c2f9224..a6487d9bb7f6ce9c6d939b282bd3afa8927d04aa 100644 (file)
--- a/tests/regression/ust/getcpu-override/Makefile.am
+++ b/tests/regression/ust/getcpu-override/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST = test_getcpu_override run-getcpu-override \
 
 else
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src
-
 # The rpath is necessary because libtool won't build a shared library
 # if it's noinst_
 GETCPU_LIBTOOL_FLAGS = \

diff --git a/tests/regression/ust/high-throughput/Makefile.am b/tests/regression/ust/high-throughput/Makefile.am
index 25913c3f4695ffe40bbca44879f8e04b01cb39ef..22a31e18b062df7f43b6ec27e08199e2fc09dda0 100644 (file)
--- a/tests/regression/ust/high-throughput/Makefile.am
+++ b/tests/regression/ust/high-throughput/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
+AM_CPPFLAGS += -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/ust/libc-wrapper/Makefile.am b/tests/regression/ust/libc-wrapper/Makefile.am
index d35ca81294a23f0487a2b9fb947e30245f33f5e2..2a800728eb0fd6f5cd6d57500ac101ecffce2dfe 100644 (file)
--- a/tests/regression/ust/libc-wrapper/Makefile.am
+++ b/tests/regression/ust/libc-wrapper/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(srcdir)
-
 noinst_PROGRAMS = prog
 prog_SOURCES = prog.c
 prog_LDADD = -llttng-ust -llttng-ust-libc-wrapper

diff --git a/tests/regression/ust/linking/Makefile.am b/tests/regression/ust/linking/Makefile.am
index 1c80ae8392144f0448ba0c228c3815e509df6d65..c70bc53a2eccaed40aebc4d5b87b19cc269dc247 100644 (file)
--- a/tests/regression/ust/linking/Makefile.am
+++ b/tests/regression/ust/linking/Makefile.am
@@ -1,6 +1,6 @@
 # -Wsystem-headers is needed to print warnings in the tracepoint
 # description file.
-AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 # Set LIBS to nothing so the application does not link on useless
 # libraries.
@@ -10,7 +10,7 @@ LIBS =
 demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
        ust_tests_demo2.h ust_tests_demo3.h
 demo_builtin_LDADD = -llttng-ust
-demo_builtin_CFLAGS = -Werror=old-style-definition
+demo_builtin_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS)
 
 # Build a version statically linked to the providers
 # contains ust_tests_demo.h and ust_tests_demo2.h provider probes
@@ -79,7 +79,7 @@ liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
 
 noinst_PROGRAMS += demo
 demo_SOURCES = demo.c ust_tests_demo.h
-demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE
+demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE $(AM_CFLAGS)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 demo_LDADD = -ldl

diff --git a/tests/regression/ust/low-throughput/Makefile.am b/tests/regression/ust/low-throughput/Makefile.am
index 630d797b38f6493e25e0037a8397fdaeaad2dec2..8ce8f24397eae0a4d358a9f623bd1c738ca3c529 100644 (file)
--- a/tests/regression/ust/low-throughput/Makefile.am
+++ b/tests/regression/ust/low-throughput/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
+AM_CPPFLAGS += -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am
index c821e5a1e2a500cb943c8b70df7e5e6a383f7397..744a27ef9b17c1e3eace9167353a4e13f4484cd0 100644 (file)
--- a/tests/regression/ust/multi-session/Makefile.am
+++ b/tests/regression/ust/multi-session/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
+AM_CFLAGS += -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/regression/ust/overlap/demo/Makefile.am b/tests/regression/ust/overlap/demo/Makefile.am
index 15f5600d61f0465d6cf6bf72207711d9e3bf6b41..4d4efb154b5542da867b37817199e8e9582d107d 100644 (file)
--- a/tests/regression/ust/overlap/demo/Makefile.am
+++ b/tests/regression/ust/overlap/demo/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = demo-trace demo.c ust_tests_demo.h \
 
 else
 
-AM_CFLAGS=-I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 # Force the shared flag on the noinst libraries since they are
 # only built static by default

diff --git a/tests/regression/ust/type-declarations/Makefile.am b/tests/regression/ust/type-declarations/Makefile.am
index be4978be32fd7186dbbc59a67d4268f391cda035..593f6dc36f030b77d8bd230f0ab59cf84fd68c70 100644 (file)
--- a/tests/regression/ust/type-declarations/Makefile.am
+++ b/tests/regression/ust/type-declarations/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 noinst_PROGRAMS = type-declarations
 type_declarations_SOURCES = type-declarations.c ust_tests_td.h

diff --git a/tests/regression/ust/ust-dl/Makefile.am b/tests/regression/ust/ust-dl/Makefile.am
index 385d448241472e1e42a5d45be63bee2424488117..5a60c167914adc65a06d16e99ae997254879f308 100644 (file)
--- a/tests/regression/ust/ust-dl/Makefile.am
+++ b/tests/regression/ust/ust-dl/Makefile.am
@@ -15,7 +15,7 @@ objcopy_verbose = $(objcopy_verbose_@AM_V@)
 objcopy_verbose_ = $(objcopy_verbose_@AM_DEFAULT_V@)
 objcopy_verbose_0 = @echo OBJCOPY $@;
 
-AM_CPPFLAGS = -I$(srcdir) -g
+AM_CPPFLAGS += -I$(srcdir) -g
 
 noinst_PROGRAMS = prog
 prog_SOURCES = prog.c

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 798e57d9336e2d899e70fe7be153b1cf38579af7..2c7365912dc106b2ed192252d5bc1e587584896d 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = ini_config
 
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \

diff --git a/tests/unit/ini_config/Makefile.am b/tests/unit/ini_config/Makefile.am
index 0a4d582866bba3fa2a50392983b3b3fa180071be..450237047b151afde1ee7fefda21e3996b22a372 100644 (file)
--- a/tests/unit/ini_config/Makefile.am
+++ b/tests/unit/ini_config/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 LIBCONFIG=$(top_builddir)/src/common/config/libconfig.la

diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c
index 44173f6f023e2c18ae8eb848ef15965c0978ca7c..5fc383c628ace598f35bf94ab4b16c99b05eb712 100644 (file)
--- a/tests/unit/test_utils_expand_path.c
+++ b/tests/unit/test_utils_expand_path.c
@@ -26,8 +26,7 @@
 
 #include <tap/tap.h>
 
-#include <src/common/utils.h>
-
+#include <common/utils.h>
 #include <common/common.h>
 
 /* For error.h */

diff --git a/tests/unit/test_utils_parse_size_suffix.c b/tests/unit/test_utils_parse_size_suffix.c
index a950a08914bcfe620f1c7ad0834e7722b957aea4..14438ad32365910129e4a7d7a8609a21352f753a 100644 (file)
--- a/tests/unit/test_utils_parse_size_suffix.c
+++ b/tests/unit/test_utils_parse_size_suffix.c
@@ -21,7 +21,7 @@
 
 #include <tap/tap.h>
 
-#include <src/common/utils.h>
+#include <common/utils.h>
 
 /* For error.h */
 int lttng_opt_quiet = 1;

diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
index d2eb49fa6fcbaab359db7069847f5dcba61282b4..9d327e0ec7b96fbb0aa554dab2699ffcbb765bd5 100644 (file)
--- a/tests/utils/Makefile.am
+++ b/tests/utils/Makefile.am
@@ -1,6 +1,5 @@
 SUBDIRS = . tap testapp
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh
 dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
 noinst_LTLIBRARIES = libtestutils.la

diff --git a/tests/utils/testapp/gen-ust-events/Makefile.am b/tests/utils/testapp/gen-ust-events/Makefile.am
index 0cc7575d7cd0b6c96d9f8f1008caf6d66b9920cc..9700eac693a9f22707db392ade5228297da9748c 100644 (file)
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-               -I$(top_srcdir)/tests/utils -I$(srcdir) -O2 -g
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir)
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
index 57f8350b42b1de51c95cf1540d6d9322837d39a7..405f05b74db4af7c00398dcedbad85bbf1d7bb42 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) \
-               -I$(top_srcdir)/tests/utils -O2 -g
+AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/utils/testapp/gen-ust-nevents/Makefile.am b/tests/utils/testapp/gen-ust-nevents/Makefile.am
index b3212228fe2a6a852c6e125a4ba4ee9cd486e321..24f64b2c6ed204a3cf1bdcd242bc8ec91c62e30e 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am
@@ -1,5 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) \
-               -I$(top_srcdir)/tests/utils -O2 -g
+AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl

diff --git a/tests/utils/testapp/gen-ust-tracef/Makefile.am b/tests/utils/testapp/gen-ust-tracef/Makefile.am
index 06171fa927c26d34d2b5da39a57d36683ef671ec..293a79c8c9837f8a4df7c8e6efa3445d477932c9 100644 (file)
--- a/tests/utils/testapp/gen-ust-tracef/Makefile.am
+++ b/tests/utils/testapp/gen-ust-tracef/Makefile.am
@@ -1,11 +1,11 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) -O2 -g
+AM_CPPFLAGS += -I$(srcdir)
 AM_LDFLAGS =
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
+AM_LDFLAGS += -ldl
 endif
 if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
+AM_LDFLAGS += -lc
 endif
 
 if HAVE_LIBLTTNG_UST_CTL