From ab7c5a7d4ef589aeeb5a2ec9eecd3e3e812d56e2 Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Sun, 6 Oct 2019 11:55:23 +0000 Subject: [PATCH] Merged in raiden00/apps (pull request #200) Some improvements to netutils/cjson and testing/unity * netutils/cjson/Makefile: fix the error when creating Make.dep * testing/unity/Makefile: fix the error when creating Make.dep * include/.gitignore: ignore cJSON headers * netutils/cjson/Kconfig: update default version to 1.7.12. Previous releases raise compilation warnings about redefined true/false Approved-by: Gregory Nutt --- include/.gitignore | 2 ++ netutils/cjson/Kconfig | 2 +- netutils/cjson/Makefile | 2 +- testing/unity/Makefile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/.gitignore b/include/.gitignore index 2a43b26b7..b6bddbc8b 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,2 +1,4 @@ /pcode +/netutils/cJSON.h +/netutils/cJSON_Utils.h diff --git a/netutils/cjson/Kconfig b/netutils/cjson/Kconfig index 8bd8713eb..46d9a4c9c 100644 --- a/netutils/cjson/Kconfig +++ b/netutils/cjson/Kconfig @@ -18,6 +18,6 @@ config NETUTILS_CJSON_URL config NETUTILS_CJSON_VERSION string "Version number" - default "1.7.11" + default "1.7.12" endif diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile index 1dfa4c67a..9f68f46f0 100644 --- a/netutils/cjson/Makefile +++ b/netutils/cjson/Makefile @@ -52,7 +52,7 @@ CJSON_UNPACKNAME = cJSON-$(CJSON_VERSION) UNPACK ?= tar -zxf CJSON_UNPACKDIR = $(WD)/$(CJSON_UNPACKNAME) -CJSON_SRCDIR = $(CJSON_UNPACKDIR) +CJSON_SRCDIR = $(CJSON_UNPACKNAME) APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)netutils diff --git a/testing/unity/Makefile b/testing/unity/Makefile index 6aae7aa33..2bd0d2d10 100644 --- a/testing/unity/Makefile +++ b/testing/unity/Makefile @@ -52,7 +52,7 @@ UNITY_UNPACKNAME = Unity-$(UNITY_VERSION) UNPACK ?= tar -zxf UNITY_UNPACKDIR = $(WD)/$(UNITY_UNPACKNAME) -UNITY_SRCDIR = $(UNITY_UNPACKDIR)$(DELIM)src +UNITY_SRCDIR = $(UNITY_UNPACKNAME)$(DELIM)src APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)testing