From 0a6c2d7c8b98a3fea54bf0f974b6d192b02d8898 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 18 Mar 2021 13:57:13 -0400
Subject: [PATCH] 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>
---
 libcounter/Makefile.am            | 1 -
 libcounter/counter.c              | 1 -
 libcounter/shm.c                  | 1 -
 libcounter/smp.c                  | 1 -
 libmsgpack/Makefile.am            | 1 -
 libmsgpack/msgpack.c              | 1 -
 tests/unit/libmsgpack/Makefile.am | 2 +-
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/libcounter/Makefile.am b/libcounter/Makefile.am
index 6407d7ad..eeeb86ce 100644
--- 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 d2b7032a..fae7266c 100644
--- 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 d9bccafc..70651e6a 100644
--- 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 314bc752..edec4a4b 100644
--- 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 03acdc2d..53b16842 100644
--- 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 918be8e5..6f31e8fb 100644
--- 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 0fb0b447..5959947d 100644
--- 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
-- 
2.34.1