From 3872b5bd66555fd110de9d116227bf93461b1544 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 7 Oct 2020 01:11:40 +0200 Subject: [PATCH] Move back jansson_path as it's not part of upstream and breaks usage of system jansson lib --- client/CMakeLists.txt | 1 + client/Makefile | 1 + client/deps/jansson/Makefile | 3 +-- client/{deps/jansson => src}/jansson_path.c | 0 client/{deps/jansson => src}/jansson_path.h | 0 5 files changed, 3 insertions(+), 2 deletions(-) rename client/{deps/jansson => src}/jansson_path.c (100%) rename client/{deps/jansson => src}/jansson_path.h (100%) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index a71e5715d..dd4811435 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -283,6 +283,7 @@ set (TARGET_SOURCES ${PM3_ROOT}/client/src/fileutils.c ${PM3_ROOT}/client/src/flash.c ${PM3_ROOT}/client/src/graph.c + ${PM3_ROOT}/client/src/jansson_path.c ${PM3_ROOT}/client/src/preferences.c ${PM3_ROOT}/client/src/pm3_binlib.c ${PM3_ROOT}/client/src/pm3_bitlib.c diff --git a/client/Makefile b/client/Makefile index e2689edd5..ac51cb1bd 100644 --- a/client/Makefile +++ b/client/Makefile @@ -505,6 +505,7 @@ SRCS = aidsearch.c \ flash.c \ generator.c \ graph.c \ + jansson_path.c \ loclass/cipher.c \ loclass/cipherutils.c \ loclass/elite_crack.c \ diff --git a/client/deps/jansson/Makefile b/client/deps/jansson/Makefile index 91f4eec7c..b51c4a77c 100644 --- a/client/deps/jansson/Makefile +++ b/client/deps/jansson/Makefile @@ -13,8 +13,7 @@ MYSRCS = \ strbuffer.c \ strconv.c \ utf.c \ - value.c \ - jansson_path.c + value.c LIB_A = libjansson.a diff --git a/client/deps/jansson/jansson_path.c b/client/src/jansson_path.c similarity index 100% rename from client/deps/jansson/jansson_path.c rename to client/src/jansson_path.c diff --git a/client/deps/jansson/jansson_path.h b/client/src/jansson_path.h similarity index 100% rename from client/deps/jansson/jansson_path.h rename to client/src/jansson_path.h