Cleanup: standardise include path

Use the same include setup as our other projects, set the default
includes globally in configure.ac by exporting AM_CPPFLAGS. Move the
local config.h to the include directory and include it by default on the
command line.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I28b48dc47cfc923d588a0033b97c2917a9c893a5

diff --git a/.gitignore b/.gitignore
index f2bf66e21dbc25906a384603e5c4d9f4447bf233..a6618cb19d3e34fb9514a10822b929f2aa9f5507 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,12 +18,13 @@ cscope.*
 configure
 /aclocal.m4
 autom4te.cache/
-/config.h
+/include/config.h
+/include/config.h.in
+/include/stamp-h1
 /include/lttng/config.h
 /include/lttng/stamp-h2
 /include/lttng/ust-version.h
 /include/lttng/ust-config.h
-/config.h.in
 /config/ar-lib
 /config/compile
 /config/config.guess
@@ -42,7 +43,6 @@ autom4te.cache/
 /m4/ltversion.m4
 config.log
 config.status
-/stamp-h1
 /libtool
 lttng-ust.pc
 lttng-ust-ctl.pc

diff --git a/configure.ac b/configure.ac
index 02d7f40cfe02e165b9d9bd42af3b7dd7a4ecd646..15fb68057ba3dbf27376d6612e3aea7bb74cd171 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_DEFINE([CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR], [UST_LIB_V_MAJOR], [Major SO
 # liblttng-ust, lttng-sessiond, and lttng-consumerd.
 AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [4:0:0])
 
-AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
+AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
@@ -41,7 +41,7 @@ AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar])
+AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
 AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules if available (Introduced in AM 1.11)
@@ -524,6 +524,13 @@ _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
 
 AM_CFLAGS="-Wall $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
+
+# The order in which the include folders are searched is important.
+# The top_builddir should always be searched first in the event that a build
+# time generated file is included.
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
+AC_SUBST(AM_CPPFLAGS)
+
 AC_SUBST(JNI_CPPFLAGS)
 
 AC_CONFIG_FILES([

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 70ebe195c002573f543d972caf70549eaaefbcce..73fadf5a3f0dea3f97aa4b879948d78914112f12 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -180,8 +180,8 @@ all-local:
                                        cmake \
                                        -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
                                        -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
-                                       -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \
-                                       -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
+                                       -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \
+                                       -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
                                        -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
                                        .. && \
                                $(MAKE) \

diff --git a/include/ust-comm.h b/include/ust-comm.h
index a5e0957235ff2503e73ec8f8dfd3f17356e05735..ed241e30468734df5565fa46c0fab7b4d0f50730 100644 (file)
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -33,7 +33,6 @@
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-ctl.h>
-#include <config.h>
 
 #ifndef LTTNG_PACKED
 #error "LTTNG_PACKED should be defined"

diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
index b904306587301285a2da365d00652b3e42c22f7b..bc0fd4c5a501b0e2ad3fcc8bb8c62f4b0e30454d 100644 (file)
--- a/liblttng-ust-comm/Makefile.am
+++ b/liblttng-ust-comm/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-
 noinst_LTLIBRARIES = liblttng-ust-comm.la
 
 liblttng_ust_comm_la_SOURCES = lttng-ust-comm.c lttng-ust-fd-tracker.c

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index f9398e0d9891311ef2cdb3837905a4a67944c9ca..619424cd813a1cebc7fdd1de99209aac9f3f1d45 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>

diff --git a/liblttng-ust-comm/lttng-ust-fd-tracker.c b/liblttng-ust-comm/lttng-ust-fd-tracker.c
index 9659f349e54ac85a3afad50b2cfc2055abcfacfc..192e240ebd41eeb98303e8ffcda05d313d2e21ed 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-fd-tracker.c
+++ b/liblttng-ust-comm/lttng-ust-fd-tracker.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/liblttng-ust-ctl/Makefile.am b/liblttng-ust-ctl/Makefile.am
index 6043d17cdbbecba5f4565f02a1067932be9fb28a..8d586a765cd804f5ad3c77ffef52628c66ce0e21 100644 (file)
--- a/liblttng-ust-ctl/Makefile.am
+++ b/liblttng-ust-ctl/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttng-ust-comm -I$(top_builddir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/liblttng-ust-comm
 AM_CFLAGS += -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-ctl.la

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index a7eca3b0b611d7d47513ab4c968b4a75666071a2..a6fb6d83380c5bb23fc0788c5249b913163a8ea0 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <stdint.h>
 #include <string.h>
 #include <sys/mman.h>

diff --git a/liblttng-ust-cyg-profile/Makefile.am b/liblttng-ust-cyg-profile/Makefile.am
index 3b1e7ebaaa8882cc35069cfaf028e73da05673ca..a3a2ff92455a91340179a1b7b183c8d4b6c0ec00 100644 (file)
--- a/liblttng-ust-cyg-profile/Makefile.am
+++ b/liblttng-ust-cyg-profile/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-cyg-profile.la \
        liblttng-ust-cyg-profile-fast.la

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c
index 61ece1f8a71df1aab45146d661fea317be8f956a..4e4e71808bb8cd8e521f6cdbe7f8ee5b633c90c9 100644 (file)
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <dlfcn.h>
 #include <sys/types.h>

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
index d19f70a6e69b4be07955bb68a6ee8db439048f9c..2fa73b2ceb93c9a920f99dc17934fad39705a602 100644 (file)
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <dlfcn.h>
 #include <sys/types.h>

diff --git a/liblttng-ust-dl/Makefile.am b/liblttng-ust-dl/Makefile.am
index 1f6d166a013ae4230f9cb22405fa0d0f899f9df9..8df6eb576c56cfd5e3e898e06fc036738f0fddc5 100644 (file)
--- a/liblttng-ust-dl/Makefile.am
+++ b/liblttng-ust-dl/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-dl.la
 liblttng_ust_dl_la_SOURCES = \

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index e38eaf1e7d8f5cda4011d887940519111f61163f..5509597e0b293a46bbb7623d7b61235d09d74ee7 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>

diff --git a/liblttng-ust-dl/ust_dl.c b/liblttng-ust-dl/ust_dl.c
index 232414328934a3727d864c83a31a9ce7ed6d7ba5..b25ba7b902a953b84323107ea260cba6a6c914b7 100644 (file)
--- a/liblttng-ust-dl/ust_dl.c
+++ b/liblttng-ust-dl/ust_dl.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #define TRACEPOINT_CREATE_PROBES
 #define TP_IP_PARAM ip

diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
index 0ea21266ecaff3d885487aa6d67380f93ff58db8..e43535e22c990637ada7906503e7c16d8137b9b0 100644 (file)
--- a/liblttng-ust-dl/ust_dl.h
+++ b/liblttng-ust-dl/ust_dl.h
@@ -34,7 +34,6 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <config.h>
 
 #define LTTNG_UST_DL_PROVIDER
 #include <lttng/tracepoint.h>

diff --git a/liblttng-ust-fd/Makefile.am b/liblttng-ust-fd/Makefile.am
index 57122ec7a65d64b424bf563946b026dd5c3e5206..f253c61f2598ad1e24af0a3cc0a91c733b693790 100644 (file)
--- a/liblttng-ust-fd/Makefile.am
+++ b/liblttng-ust-fd/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS += -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-fd.la

diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
index 7bb3cecf137986d38902add0e77d30985811410a..02c40d8cc3c0dd604226ebeb89fc240841a8ea1f 100644 (file)
--- a/liblttng-ust-fd/lttng-ust-fd.c
+++ b/liblttng-ust-fd/lttng-ust-fd.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>

diff --git a/liblttng-ust-fork/Makefile.am b/liblttng-ust-fork/Makefile.am
index d05f5b933ecd440356b9b3105847f651339b8de5..de318c92b5f3a5654f2ef354364bf3f25c26edaa 100644 (file)
--- a/liblttng-ust-fork/Makefile.am
+++ b/liblttng-ust-fork/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS += -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-fork.la

diff --git a/liblttng-ust-fork/ustfork.c b/liblttng-ust-fork/ustfork.c
index 983ed04f83e11316690430e494ffe4939a44bd9b..3c0037ee8449478bab76715a64f24dc73d0d8cdf 100644 (file)
--- a/liblttng-ust-fork/ustfork.c
+++ b/liblttng-ust-fork/ustfork.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <lttng/ust-dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>

diff --git a/liblttng-ust-java-agent/jni/common/Makefile.am b/liblttng-ust-java-agent/jni/common/Makefile.am
index 1baf306d83368bd0ba6d231cba1a670adab66b9d..5fb6b2b33da10e8872c0434ca50a14332c84f447 100644 (file)
--- a/liblttng-ust-java-agent/jni/common/Makefile.am
+++ b/liblttng-ust-java-agent/jni/common/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
+AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
 
 lib_LTLIBRARIES = liblttng-ust-context-jni.la
 liblttng_ust_context_jni_la_SOURCES = lttng_ust_context.c lttng_ust_context.h

diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am b/liblttng-ust-java-agent/jni/jul/Makefile.am
index 39ff52a0fc5c060ccb9f59ef1093b01ff58b95f4..bba128446db184321fc7936e97ee624c694bca11 100644 (file)
--- a/liblttng-ust-java-agent/jni/jul/Makefile.am
+++ b/liblttng-ust-java-agent/jni/jul/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
+AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
 
 lib_LTLIBRARIES = liblttng-ust-jul-jni.la
 liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \

diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/liblttng-ust-java-agent/jni/log4j/Makefile.am
index 188597d24a9e936c4af217823f4d48ab669e6107..4e007244b3d2be07df73d82368d51c147f3f7626 100644 (file)
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
+AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
 
 lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
 liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 387ddba9431c4ceb4471f8b85a8cd3a5018b0b28..dc4bbc68d8938c9b23a270c615d5bfc0bb310efc 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -7,7 +7,7 @@ dist_noinst_JAVA = $(pkgpath)/LTTngUst.java
 jar_DATA = $(jarfile)
 BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
+AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
 lib_LTLIBRARIES = liblttng-ust-java.la
 liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
 nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h

diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
index 68aa02c7d024e3b2579fe404677b4cf757b38a6f..12e8196623f69c4542fa0a91689a41a653906167 100644 (file)
--- a/liblttng-ust-libc-wrapper/Makefile.am
+++ b/liblttng-ust-libc-wrapper/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la \
   liblttng-ust-pthread-wrapper.la

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 9e7d1e63f2893668343adb172406497b76f81ca6..f9081a09d993e9090a7953cbff35927b2f9b56eb 100644 (file)
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 /*
  * Do _not_ define _LGPL_SOURCE because we don't want to create a
  * circular dependency loop between this malloc wrapper, liburcu and

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
index 7836ffa02175d7599e4472403964b1b1069f4c33..1e65207f8bc007e69539e3220cca7a89f1e69d67 100644 (file)
--- a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 /*
  * Do _not_ define _LGPL_SOURCE because we don't want to create a
  * circular dependency loop between this malloc wrapper, liburcu and

diff --git a/liblttng-ust-python-agent/Makefile.am b/liblttng-ust-python-agent/Makefile.am
index 077e50c5fb4d581eddf31151dd994161f6d9581a..43cc27a8e187701e67c7f6ca132b14f6425ec01c 100644 (file)
--- a/liblttng-ust-python-agent/Makefile.am
+++ b/liblttng-ust-python-agent/Makefile.am
@@ -1,7 +1,5 @@
 # tracepoint provider: always built/installed (does not depend on Python per se)
-AM_CPPFLAGS = -I$(top_srcdir)/include/ \
-       -I$(top_builddir)/include/
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-python-agent.la
 

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 3c7da7e6275ef8c979ce026f5675939219437c85..169db3298f4310aae4489b64674276b59139fc62 100644 (file)
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 

diff --git a/liblttng-ust/lttng-clock.c b/liblttng-ust/lttng-clock.c
index 5c33de0c477d5b46a77c25a6a19f27d7b346d9b2..2dad376194113509f4c29c0aae562973916a6df4 100644 (file)
--- a/liblttng-ust/lttng-clock.c
+++ b/liblttng-ust/lttng-clock.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <error.h>
 #include <dlfcn.h>

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index 7a9dd5fd43b28cd46de3ed3d1047cc8522596cc2..3f6462e65916cc0383a223722f2826e0d7a7aada 100644 (file)
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -26,7 +26,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stddef.h>
 #include <sys/types.h>

diff --git a/liblttng-ust/lttng-context-vsgid.c b/liblttng-ust/lttng-context-vsgid.c
index 45fd28603aa9060a0f44ecbc0194fdb9a6c57381..685264bf81aa5d32a679b008d7575258a88eb1c9 100644 (file)
--- a/liblttng-ust/lttng-context-vsgid.c
+++ b/liblttng-ust/lttng-context-vsgid.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stddef.h>
 #include <sys/types.h>

diff --git a/liblttng-ust/lttng-context-vsuid.c b/liblttng-ust/lttng-context-vsuid.c
index f728a31d525b10d4bdb703d7500e6c54315010c4..650ee7c63c84a3597e87340ba17592c111d0c900 100644 (file)
--- a/liblttng-ust/lttng-context-vsuid.c
+++ b/liblttng-ust/lttng-context-vsuid.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stddef.h>
 #include <sys/types.h>

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 627cd4e101df4280b5a44b96f4719301c265df9b..d1beac3a6d027154e5d40acd696a0d1cfcb6cf14 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <urcu/list.h>

diff --git a/liblttng-ust/lttng-getcpu.c b/liblttng-ust/lttng-getcpu.c
index 7cc9faa8c40f9af8cd38353ff62df44eaa1421a6..7c33b49492cb944c5aa303ce753c29c59fc67f70 100644 (file)
--- a/liblttng-ust/lttng-getcpu.c
+++ b/liblttng-ust/lttng-getcpu.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <error.h>
 #include <dlfcn.h>

diff --git a/liblttng-ust/lttng-ring-buffer-client-discard-rt.c b/liblttng-ust/lttng-ring-buffer-client-discard-rt.c
index d57d5492dc3a15df355a74041a9b4014d66f6f15..60649044b84a6704a43ced452b8fbd743942eddc 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client-discard-rt.c
+++ b/liblttng-ust/lttng-ring-buffer-client-discard-rt.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include "lttng-tracer.h"
 

diff --git a/liblttng-ust/lttng-ring-buffer-client-discard.c b/liblttng-ust/lttng-ring-buffer-client-discard.c
index a5fcc80749f7e9a8208c271d294af220d5a2c01c..856188d0f250d78a3ec8c71f7447da216774f74d 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client-discard.c
+++ b/liblttng-ust/lttng-ring-buffer-client-discard.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include "lttng-tracer.h"
 

diff --git a/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c b/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c
index 1b4fff1bdacc7b00c51b3d22795948fdb0cc2b8c..a245f7bf9871bd5fbe43cce19f7cd2fc9ac3b839 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c
+++ b/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include "lttng-tracer.h"
 

diff --git a/liblttng-ust/lttng-ring-buffer-client-overwrite.c b/liblttng-ust/lttng-ring-buffer-client-overwrite.c
index 5564e8e5f224d63d4341aea36d59e8a135b3a1d3..6358e7d5de13be3266b072c0d65cb5dfeecd6e86 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client-overwrite.c
+++ b/liblttng-ust/lttng-ring-buffer-client-overwrite.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include "lttng-tracer.h"
 

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.c b/liblttng-ust/lttng-ring-buffer-metadata-client.c
index f14294a99336349332f7688826e6f32c076772cd..59f3215e52bc5a65cb7a3a27746d760e1ea244c2 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.c
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include "lttng-tracer.h"
 

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 3847c9767d97d9d7e99f8ecf98208877f17ac917..6258bfd2485691eae04411278f1bc2ed111d58c0 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -20,7 +20,6 @@
  */
 
 #define _LGPL_SOURCE
-#define _GNU_SOURCE
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>

diff --git a/liblttng-ust/lttng-ust-dynamic-type.c b/liblttng-ust/lttng-ust-dynamic-type.c
index 9c72e71f14c321c40ff9dc61b3868aa424b3ac70..ba7f96b5375cd664bbcf7df5565de6b88672f308 100644 (file)
--- a/liblttng-ust/lttng-ust-dynamic-type.c
+++ b/liblttng-ust/lttng-ust-dynamic-type.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdint.h>

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index 5de3561fbeefcc71a56522f8763fb628dbdcede3..b7c0acb5d0d04c7def84ed4de4bfa85eadf3f0e3 100644 (file)
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <fcntl.h>
 #include <helper.h>

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 040223d58409bd93b2ceedb9d8d8979e463beac1..d0094c41958ede12895e54899cf99666deaa3ff9 100644 (file)
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <link.h>
 #include <limits.h>

diff --git a/liblttng-ust/tracef.c b/liblttng-ust/tracef.c
index fa001ea28c7245b3b5dde95a482b8935bbc4ddcc..d5d702a85a7acac405596cc3aec0a49d3d54bedc 100644 (file)
--- a/liblttng-ust/tracef.c
+++ b/liblttng-ust/tracef.c
@@ -20,7 +20,6 @@
  * SOFTWARE.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <helper.h>

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index ed8a067d84cec0eaf6c8e08b4710da4a90ef9940..c1ed128822bd2811c0aa66b6d8fe9a95bf2dbe4b 100644 (file)
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -20,7 +20,6 @@
  * SOFTWARE.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <helper.h>

diff --git a/libringbuffer/Makefile.am b/libringbuffer/Makefile.am
index ac9430d668c11f5363fd43d6590052a37bebeb4d..53b0b148ce54f49a5518b781f87564625d215e85 100644 (file)
--- a/libringbuffer/Makefile.am
+++ b/libringbuffer/Makefile.am
@@ -1,4 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS += -fno-strict-aliasing
 
 noinst_LTLIBRARIES = libringbuffer.la

diff --git a/libringbuffer/getcpu.h b/libringbuffer/getcpu.h
index 7b009dc6cf38efefd67aece71a8308a66a351efb..ea346cc6847e1e5fd4961cf588a23bafa0e8674b 100644 (file)
--- a/libringbuffer/getcpu.h
+++ b/libringbuffer/getcpu.h
@@ -22,7 +22,6 @@
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 #include <urcu/arch.h>
-#include <config.h>
 
 void lttng_ust_getcpu_init(void);
 

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index f75adbcef1204b017a16e5e4ea3be4eb0023f2e6..46df102b545facd94a8d2b7748f40b9dcdfe9420 100644 (file)
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stddef.h>
 #include <stdint.h>

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index dd20852fec8ae6e58d210bc1fe7a288a677c3ff8..4f1af6d07d1444c13e703a8942a5cd65b555f9a7 100644 (file)
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -51,7 +51,6 @@
  *   - put_subbuf
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <sys/types.h>
 #include <sys/mman.h>

diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c
index 461befb99db5ed45cde5dcdcfecb860df06003b3..9bcc7d9f80c16d29f491f276e9eb0d81e9e13971 100644 (file)
--- a/libringbuffer/shm.c
+++ b/libringbuffer/shm.c
@@ -19,7 +19,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <config.h>
 #include "shm.h"
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/libringbuffer/smp.c b/libringbuffer/smp.c
index 656a75da2787a40d6ac1188263863069f42745cd..3e0a427bc53f0f33c28e16325572f8a1a0efb7a2 100644 (file)
--- a/libringbuffer/smp.c
+++ b/libringbuffer/smp.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <unistd.h>
 #include <pthread.h>

diff --git a/snprintf/Makefile.am b/snprintf/Makefile.am
index 59b0272325adeefd6ed6c9d4bff8e15bb39fed4b..17e698c47f0cdfab445bc8eb6193f7c197a8375c 100644 (file)
--- a/snprintf/Makefile.am
+++ b/snprintf/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm
+AM_CPPFLAGS += -I$(top_srcdir)/libustcomm
 AM_CFLAGS += -fno-strict-aliasing
 
 noinst_LTLIBRARIES = libustsnprintf.la

diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index de44d2e9555f368433754f16a734535c06aa7892..94f7e2217c4889432e99953f5cec3d4a3cca81b9 100644 (file)
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = bench1 bench2
 bench1_SOURCES = bench.c tp.c ust_tests_benchmark.h

diff --git a/tests/benchmark/bench.c b/tests/benchmark/bench.c
index 517bfb73078db7b74769b00f81143576dd723000..3fafe5d154207aae70672fbac6251f0d64ca4db2 100644 (file)
--- a/tests/benchmark/bench.c
+++ b/tests/benchmark/bench.c
@@ -20,7 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>

diff --git a/tests/ctf-types/Makefile.am b/tests/ctf-types/Makefile.am
index 0e47359cc37ed2b939b7fd694c66936e42c7393f..8fcb1a2dd7ba99b5a9b83a5e47e4fc5aaa65b57b 100644 (file)
--- a/tests/ctf-types/Makefile.am
+++ b/tests/ctf-types/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = ctf-types
 ctf_types_SOURCES = ctf-types.c tp.c ust_tests_ctf_types.h

diff --git a/tests/gcc-weak-hidden/Makefile.am b/tests/gcc-weak-hidden/Makefile.am
index be9032a354667bf31e33db3bf322a7fb7bdf7936..da3d301ba2b1b6ef46b6b0f459382ff043085209 100644 (file)
--- a/tests/gcc-weak-hidden/Makefile.am
+++ b/tests/gcc-weak-hidden/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 noinst_LTLIBRARIES = libgcc-wh.la
 libgcc_wh_la_SOURCES = c.c d.c

diff --git a/tests/hello-many/Makefile.am b/tests/hello-many/Makefile.am
index 577718f503f9c88b1d3fb69388fd5e3218959a0d..d8f140b2e7bef554eacc44a908b84b851927e1e3 100644 (file)
--- a/tests/hello-many/Makefile.am
+++ b/tests/hello-many/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = hello-many
 hello_many_SOURCES = hello-many.c tp.c ust_tests_hello_many.h

diff --git a/tests/hello.cxx/Makefile.am b/tests/hello.cxx/Makefile.am
index f8a718b43438950db5a638ce5c0016cdadeb73d1..9d809139f89ad9dfdc8e8e7d9d714c1f58451f30 100644 (file)
--- a/tests/hello.cxx/Makefile.am
+++ b/tests/hello.cxx/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.cpp tp-cpp.cpp ust_tests_hello.h

diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index d249909cfb65ba40feaa641ff6b0ea0bff1aeebc..04fb9bef73aeca90c8fc9a03c4c595a2bf466e31 100644 (file)
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c ust_tests_hello.h

diff --git a/tests/same_line_tracepoint/Makefile.am b/tests/same_line_tracepoint/Makefile.am
index c2c2bbbfe52f60296cd067ffdf2f1102b05d480b..598dbecc6393be8d1e47aacfd09f324e43e06f36 100644 (file)
--- a/tests/same_line_tracepoint/Makefile.am
+++ b/tests/same_line_tracepoint/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = same_line_tracepoint
 same_line_tracepoint_SOURCES = same_line_tracepoint.c ust_tests_sameline.h

diff --git a/tests/snprintf/Makefile.am b/tests/snprintf/Makefile.am
index 3e2b37c96d27e233fb5dfb59eeab2d21682c9be5..db0aca938259348192fe03bd8f05793fb97f0396 100644 (file)
--- a/tests/snprintf/Makefile.am
+++ b/tests/snprintf/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 noinst_PROGRAMS = test_snprintf
 test_snprintf_SOURCES = snprintf.c

diff --git a/tests/test-app-ctx/Makefile.am b/tests/test-app-ctx/Makefile.am
index d5e42d331eb41d4b62677a74cc04f3dbfb71a624..699165b1b87c015f7c2bbf16a03ce6749a13ba3c 100644 (file)
--- a/tests/test-app-ctx/Makefile.am
+++ b/tests/test-app-ctx/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c ust_tests_hello.h

diff --git a/tests/ust-elf/Makefile.am b/tests/ust-elf/Makefile.am
index d14f03f7cc777a67eb7621368585173a09f91794..eadbaa8964c3c93e076b9f5704e8e61676ea5b6e 100644 (file)
--- a/tests/ust-elf/Makefile.am
+++ b/tests/ust-elf/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 noinst_PROGRAMS = ust-elf
 ust_elf_SOURCES = ust-elf.c

diff --git a/tests/utils/tap.c b/tests/utils/tap.c
index 8bf72f6fcde57dac97fd9673cb0df5efdf9b6b0c..08dfa658ca76e4e3cdca4ab1fca7f1c694b4d791 100644 (file)
--- a/tests/utils/tap.c
+++ b/tests/utils/tap.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#define _GNU_SOURCE
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>