fix: don't override the project wide AM_CPPFLAGS

Fix some makefiles imported after we switched to a global standardized
include path in AM_CPPFLAGS.

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

diff --git a/libcounter/Makefile.am b/libcounter/Makefile.am
index 6407d7adaa2a7a0d2795a39b8f149708521e369f..eeeb86cec5aefd35f6a498a65365f243db5d9772 100644 (file)
--- a/libcounter/Makefile.am
+++ b/libcounter/Makefile.am
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS += -fno-strict-aliasing
 
 noinst_LTLIBRARIES = libcounter.la

diff --git a/libcounter/counter.c b/libcounter/counter.c
index d2b7032af2ada6a6e623a8a755a4e0180e3e98c7..fae7266cde315364ff6ca1d61c47bc666e625392 100644 (file)
--- a/libcounter/counter.c
+++ b/libcounter/counter.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #include <errno.h>
 #include "counter.h"
 #include "counter-internal.h"

diff --git a/libcounter/shm.c b/libcounter/shm.c
index d9bccafcf6d3eaeccfb7cb977d775a520f6e0155..70651e6a44ee38876d642da34fa6dba72967f556 100644 (file)
--- a/libcounter/shm.c
+++ b/libcounter/shm.c
@@ -5,7 +5,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <config.h>
 #include "shm.h"
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/libcounter/smp.c b/libcounter/smp.c
index 314bc752e2b868e27a3a7b6522c8b940563894eb..edec4a4b3f4701be7aa3601e331449ad19773f5c 100644 (file)
--- a/libcounter/smp.c
+++ b/libcounter/smp.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 
 #include <unistd.h>

diff --git a/libmsgpack/Makefile.am b/libmsgpack/Makefile.am
index 03acdc2dd100344db091aab2dea0aaa43498cb1e..53b16842489cc6da5077e9c116113a6144354b4b 100644 (file)
--- a/libmsgpack/Makefile.am
+++ b/libmsgpack/Makefile.am
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS += -fno-strict-aliasing
 
 noinst_LTLIBRARIES = libmsgpack.la

diff --git a/libmsgpack/msgpack.c b/libmsgpack/msgpack.c
index 918be8e591012cf83c684072af0ba6ce16e8d2de..6f31e8fb176c9e604ec457eaeb1e27661da00890 100644 (file)
--- a/libmsgpack/msgpack.c
+++ b/libmsgpack/msgpack.c
@@ -4,7 +4,6 @@
  * Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stddef.h>
 

diff --git a/tests/unit/libmsgpack/Makefile.am b/tests/unit/libmsgpack/Makefile.am
index 0fb0b447fc5b4968518f0a2063227817ddc9a17d..5959947d65bd3966f8205ea84d5d5061495367db 100644 (file)
--- a/tests/unit/libmsgpack/Makefile.am
+++ b/tests/unit/libmsgpack/Makefile.am
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 noinst_PROGRAMS = test_msgpack
 test_msgpack_SOURCES = test_msgpack.c