[PATCH] Makefile.am: remove references to json or json-c

Colin King colin.king at canonical.com
Mon Apr 12 16:37:39 UTC 2021


From: Colin Ian King <colin.king at canonical.com>

BugLink: https://github.com/ColinIanKing/fwts/issues/3

fwts uses its own minimal json implementation so remove the
references to json and json-c

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/Makefile.am               | 2 --
 src/libfwtsacpica/Makefile.am | 2 --
 src/utilities/Makefile.am     | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a26a197b..bb99b987 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,8 +11,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/acpica/source/include	\
 	-I$(top_srcdir)/src/acpica/source/compiler	\
 	-I$(top_srcdir)/efi_runtime			\
-	`pkg-config --silence-errors --cflags json`	\
-	`pkg-config --silence-errors --cflags json-c`	\
 	-pthread `pkg-config --cflags glib-2.0 gio-2.0` \
 	-Wall -Werror -Wextra				\
 	-Wno-address-of-packed-member			\
diff --git a/src/libfwtsacpica/Makefile.am b/src/libfwtsacpica/Makefile.am
index fc68d3b1..0f6cbcac 100644
--- a/src/libfwtsacpica/Makefile.am
+++ b/src/libfwtsacpica/Makefile.am
@@ -26,8 +26,6 @@ AM_CPPFLAGS = 						\
 	-I$(top_srcdir)/src/lib/include			\
 	-I$(srcdir)/../acpica/source/include		\
 	-I$(srcdir)/../acpica/source/tools/acpiexec	\
-	`pkg-config --silence-errors --cflags json`	\
-	`pkg-config --silence-errors --cflags json-c`	\
 	-Wall -fno-strict-aliasing			\
 	-Wno-address-of-packed-member
 
diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
index 333723f5..1fc0fc02 100644
--- a/src/utilities/Makefile.am
+++ b/src/utilities/Makefile.am
@@ -17,8 +17,6 @@
 #
 
 AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" 	\
-	`pkg-config --silence-errors --cflags json`			\
-	`pkg-config --silence-errors --cflags json-c`			\
 	-I$(srcdir)/../lib/include
 
 bin_PROGRAMS = kernelscan
-- 
2.30.2




More information about the fwts-devel mailing list