diff options
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | contrib/update_jsmn.sh | 6 | ||||
-rw-r--r-- | dependencies/jsmn/.clang-format (renamed from contrib/jsmn/.clang-format) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/.travis.yml (renamed from contrib/jsmn/.travis.yml) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/LICENSE (renamed from contrib/jsmn/LICENSE) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/Makefile (renamed from contrib/jsmn/Makefile) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/README.md (renamed from contrib/jsmn/README.md) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/example/jsondump.c (renamed from contrib/jsmn/example/jsondump.c) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/example/simple.c (renamed from contrib/jsmn/example/simple.c) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/jsmn.h (renamed from contrib/jsmn/jsmn.h) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/library.json (renamed from contrib/jsmn/library.json) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/test/test.h (renamed from contrib/jsmn/test/test.h) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/test/tests.c (renamed from contrib/jsmn/test/tests.c) | 0 | ||||
-rw-r--r-- | dependencies/jsmn/test/testutil.h (renamed from contrib/jsmn/test/testutil.h) | 0 | ||||
-rw-r--r-- | dependencies/nDPIsrvd.h (renamed from contrib/nDPIsrvd.h) | 0 | ||||
-rw-r--r-- | dependencies/nDPIsrvd.py (renamed from contrib/nDPIsrvd.py) | 0 | ||||
-rwxr-xr-x | dependencies/update_jsmn.sh | 6 | ||||
-rw-r--r-- | examples/c-json-stdout/c-json-stdout.c | 2 |
18 files changed, 8 insertions, 8 deletions
@@ -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 bc6a51ca1..000000000 --- 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 index 3a5940ef6..3a5940ef6 100644 --- a/contrib/jsmn/.clang-format +++ b/dependencies/jsmn/.clang-format diff --git a/contrib/jsmn/.travis.yml b/dependencies/jsmn/.travis.yml index 1c8ebd327..1c8ebd327 100644 --- a/contrib/jsmn/.travis.yml +++ b/dependencies/jsmn/.travis.yml diff --git a/contrib/jsmn/LICENSE b/dependencies/jsmn/LICENSE index c84fb2e97..c84fb2e97 100644 --- a/contrib/jsmn/LICENSE +++ b/dependencies/jsmn/LICENSE diff --git a/contrib/jsmn/Makefile b/dependencies/jsmn/Makefile index dcbdd89d7..dcbdd89d7 100644 --- a/contrib/jsmn/Makefile +++ b/dependencies/jsmn/Makefile diff --git a/contrib/jsmn/README.md b/dependencies/jsmn/README.md index f8249f3dd..f8249f3dd 100644 --- a/contrib/jsmn/README.md +++ b/dependencies/jsmn/README.md diff --git a/contrib/jsmn/example/jsondump.c b/dependencies/jsmn/example/jsondump.c index 1eb620640..1eb620640 100644 --- a/contrib/jsmn/example/jsondump.c +++ b/dependencies/jsmn/example/jsondump.c diff --git a/contrib/jsmn/example/simple.c b/dependencies/jsmn/example/simple.c index 1254575a1..1254575a1 100644 --- a/contrib/jsmn/example/simple.c +++ b/dependencies/jsmn/example/simple.c diff --git a/contrib/jsmn/jsmn.h b/dependencies/jsmn/jsmn.h index 3178dcc97..3178dcc97 100644 --- a/contrib/jsmn/jsmn.h +++ b/dependencies/jsmn/jsmn.h diff --git a/contrib/jsmn/library.json b/dependencies/jsmn/library.json index 8e2f5c257..8e2f5c257 100644 --- a/contrib/jsmn/library.json +++ b/dependencies/jsmn/library.json diff --git a/contrib/jsmn/test/test.h b/dependencies/jsmn/test/test.h index a1c0957a7..a1c0957a7 100644 --- a/contrib/jsmn/test/test.h +++ b/dependencies/jsmn/test/test.h diff --git a/contrib/jsmn/test/tests.c b/dependencies/jsmn/test/tests.c index d8a4d922e..d8a4d922e 100644 --- a/contrib/jsmn/test/tests.c +++ b/dependencies/jsmn/test/tests.c diff --git a/contrib/jsmn/test/testutil.h b/dependencies/jsmn/test/testutil.h index bdee13934..bdee13934 100644 --- a/contrib/jsmn/test/testutil.h +++ b/dependencies/jsmn/test/testutil.h diff --git a/contrib/nDPIsrvd.h b/dependencies/nDPIsrvd.h index 320fdac08..320fdac08 100644 --- a/contrib/nDPIsrvd.h +++ b/dependencies/nDPIsrvd.h diff --git a/contrib/nDPIsrvd.py b/dependencies/nDPIsrvd.py index 6bcaf516c..6bcaf516c 100644 --- a/contrib/nDPIsrvd.py +++ b/dependencies/nDPIsrvd.py diff --git a/dependencies/update_jsmn.sh b/dependencies/update_jsmn.sh new file mode 100755 index 000000000..6b187e177 --- /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 eb56470e7..b70d7bac5 100644 --- a/examples/c-json-stdout/c-json-stdout.c +++ b/examples/c-json-stdout/c-json-stdout.c @@ -8,7 +8,7 @@ #include <unistd.h> #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; |