[PATCH][RESEND] updated automake files for libjson-c (LP: #1268005)
Colin King
colin.king at canonical.com
Mon Jan 13 09:54:23 UTC 2014
From: Colin Ian King <colin.king at canonical.com>
This enables builds with json-c 0.11. Thanks to Jeffy Bastian for this
fix.
Signed-off-by: Jeffrey Bastian <jbastian at redhat.com>
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
src/Makefile.am | 2 +-
src/lib/src/Makefile.am | 2 +-
src/utilities/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index df685d5..d65b066 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,7 @@ fwts_SOURCES = main.c \
uefi/securebootcert/securebootcert.c \
uefi/uefivarinfo/uefivarinfo.c
-fwts_LDFLAGS = -ljson -lm
+fwts_LDFLAGS = -ljson -ljson-c -lm
fwts_LDADD = \
-Llib/src -lfwts \
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
index d708f34..a07d5e2 100644
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
pkglib_LTLIBRARIES = libfwts.la
libfwts_la_LDFLAGS = \
- -lm -lpcre -lpthread -ljson \
+ -lm -lpcre -lpthread -ljson -ljson-c \
-version-info 1:0:0 \
-L$(top_srcdir)/src/acpica/source/compiler \
-lfwtsiasl
diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
index 427c44f..cc2e115 100644
--- a/src/utilities/Makefile.am
+++ b/src/utilities/Makefile.am
@@ -2,5 +2,5 @@ AM_CPPFLAGS = -Wall -Werror -Wextra
bin_PROGRAMS = kernelscan
kernelscan_SOURCES = kernelscan.c
-kernelscan_LDFLAGS = -ljson -lpcre
+kernelscan_LDFLAGS = -ljson -ljson-c -lpcre
--
1.8.3.2
More information about the fwts-devel
mailing list