From 7853c79cd66394e13e9962c5cfebc20dbbf7cbe5 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Fri, 13 Nov 2020 14:15:23 +0100 Subject: [PATCH] Renamed misleading "contrib" subfolder to "dependencies". Signed-off-by: Toni Uhlig --- Makefile | 2 +- contrib/update_jsmn.sh | 6 ------ {contrib => dependencies}/jsmn/.clang-format | 0 {contrib => dependencies}/jsmn/.travis.yml | 0 {contrib => dependencies}/jsmn/LICENSE | 0 {contrib => dependencies}/jsmn/Makefile | 0 {contrib => dependencies}/jsmn/README.md | 0 {contrib => dependencies}/jsmn/example/jsondump.c | 0 {contrib => dependencies}/jsmn/example/simple.c | 0 {contrib => dependencies}/jsmn/jsmn.h | 0 {contrib => dependencies}/jsmn/library.json | 0 {contrib => dependencies}/jsmn/test/test.h | 0 {contrib => dependencies}/jsmn/test/tests.c | 0 {contrib => dependencies}/jsmn/test/testutil.h | 0 {contrib => dependencies}/nDPIsrvd.h | 0 {contrib => dependencies}/nDPIsrvd.py | 0 dependencies/update_jsmn.sh | 6 ++++++ examples/c-json-stdout/c-json-stdout.c | 2 +- 18 files changed, 8 insertions(+), 8 deletions(-) delete mode 100755 contrib/update_jsmn.sh rename {contrib => dependencies}/jsmn/.clang-format (100%) rename {contrib => dependencies}/jsmn/.travis.yml (100%) rename {contrib => dependencies}/jsmn/LICENSE (100%) rename {contrib => dependencies}/jsmn/Makefile (100%) rename {contrib => dependencies}/jsmn/README.md (100%) rename {contrib => dependencies}/jsmn/example/jsondump.c (100%) rename {contrib => dependencies}/jsmn/example/simple.c (100%) rename {contrib => dependencies}/jsmn/jsmn.h (100%) rename {contrib => dependencies}/jsmn/library.json (100%) rename {contrib => dependencies}/jsmn/test/test.h (100%) rename {contrib => dependencies}/jsmn/test/tests.c (100%) rename {contrib => dependencies}/jsmn/test/testutil.h (100%) rename {contrib => dependencies}/nDPIsrvd.h (100%) rename {contrib => dependencies}/nDPIsrvd.py (100%) create mode 100755 dependencies/update_jsmn.sh diff --git a/Makefile b/Makefile index d5311a37..79291658 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC = gcc PROJECT_CFLAGS += -Wall -Wextra $(EXTRA_CFLAGS) -I. -JSMN_CFLAGS := -DJSMN_STATIC=1 -DJSMN_STRICT=1 -Icontrib -Icontrib/jsmn +JSMN_CFLAGS := -DJSMN_STATIC=1 -DJSMN_STRICT=1 -Idependencies LIBS += -pthread -lpcap -lm GOCC = diff --git a/contrib/update_jsmn.sh b/contrib/update_jsmn.sh deleted file mode 100755 index bc6a51ca..00000000 --- a/contrib/update_jsmn.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh - -MYDIR="$(dirname ${0})" -cd "${MYDIR}/.." - -git subtree pull --squash --prefix=contrib/jsmn https://github.com/zserge/jsmn.git master diff --git a/contrib/jsmn/.clang-format b/dependencies/jsmn/.clang-format similarity index 100% rename from contrib/jsmn/.clang-format rename to dependencies/jsmn/.clang-format diff --git a/contrib/jsmn/.travis.yml b/dependencies/jsmn/.travis.yml similarity index 100% rename from contrib/jsmn/.travis.yml rename to dependencies/jsmn/.travis.yml diff --git a/contrib/jsmn/LICENSE b/dependencies/jsmn/LICENSE similarity index 100% rename from contrib/jsmn/LICENSE rename to dependencies/jsmn/LICENSE diff --git a/contrib/jsmn/Makefile b/dependencies/jsmn/Makefile similarity index 100% rename from contrib/jsmn/Makefile rename to dependencies/jsmn/Makefile diff --git a/contrib/jsmn/README.md b/dependencies/jsmn/README.md similarity index 100% rename from contrib/jsmn/README.md rename to dependencies/jsmn/README.md diff --git a/contrib/jsmn/example/jsondump.c b/dependencies/jsmn/example/jsondump.c similarity index 100% rename from contrib/jsmn/example/jsondump.c rename to dependencies/jsmn/example/jsondump.c diff --git a/contrib/jsmn/example/simple.c b/dependencies/jsmn/example/simple.c similarity index 100% rename from contrib/jsmn/example/simple.c rename to dependencies/jsmn/example/simple.c diff --git a/contrib/jsmn/jsmn.h b/dependencies/jsmn/jsmn.h similarity index 100% rename from contrib/jsmn/jsmn.h rename to dependencies/jsmn/jsmn.h diff --git a/contrib/jsmn/library.json b/dependencies/jsmn/library.json similarity index 100% rename from contrib/jsmn/library.json rename to dependencies/jsmn/library.json diff --git a/contrib/jsmn/test/test.h b/dependencies/jsmn/test/test.h similarity index 100% rename from contrib/jsmn/test/test.h rename to dependencies/jsmn/test/test.h diff --git a/contrib/jsmn/test/tests.c b/dependencies/jsmn/test/tests.c similarity index 100% rename from contrib/jsmn/test/tests.c rename to dependencies/jsmn/test/tests.c diff --git a/contrib/jsmn/test/testutil.h b/dependencies/jsmn/test/testutil.h similarity index 100% rename from contrib/jsmn/test/testutil.h rename to dependencies/jsmn/test/testutil.h diff --git a/contrib/nDPIsrvd.h b/dependencies/nDPIsrvd.h similarity index 100% rename from contrib/nDPIsrvd.h rename to dependencies/nDPIsrvd.h diff --git a/contrib/nDPIsrvd.py b/dependencies/nDPIsrvd.py similarity index 100% rename from contrib/nDPIsrvd.py rename to dependencies/nDPIsrvd.py diff --git a/dependencies/update_jsmn.sh b/dependencies/update_jsmn.sh new file mode 100755 index 00000000..6b187e17 --- /dev/null +++ b/dependencies/update_jsmn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +MYDIR="$(dirname ${0})" +cd "${MYDIR}/.." + +git subtree pull --squash --prefix=dependencies/jsmn https://github.com/zserge/jsmn.git master diff --git a/examples/c-json-stdout/c-json-stdout.c b/examples/c-json-stdout/c-json-stdout.c index eb56470e..b70d7bac 100644 --- a/examples/c-json-stdout/c-json-stdout.c +++ b/examples/c-json-stdout/c-json-stdout.c @@ -8,7 +8,7 @@ #include #include "config.h" -#include "jsmn.h" +#include "jsmn/jsmn.h" static char serv_listen_addr[INET_ADDRSTRLEN] = DISTRIBUTOR_HOST; static uint16_t serv_listen_port = DISTRIBUTOR_PORT;