aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2020-10-06 17:39:40 +0200
committerToni Uhlig <matzeton@googlemail.com>2020-10-06 18:51:02 +0200
commit4dd45375244954e7b2e310bb2983f031f3a5a3b8 (patch)
tree5dd2c810eed9f7e8e0f39685b40f5bba441f1fdf /Makefile
parentf3fd51a74fa537f500607af1d14c8cfa9a0a99ca (diff)
Travi CI
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 714ecb2a3..577de3511 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
else
ifeq ($(NDPI_WITH_GCRYPT),yes)
-LIBS += -lgcrypt
+LIBS += -lgcrypt -lgpg-error
else
NDPI_WITH_GCRYPT = no
endif
@@ -30,12 +30,13 @@ NDPI_WITH_PCRE = no
endif
ifneq ($(CUSTOM_LIBNDPI),)
-LIBS += '$(CUSTOM_LIBNDPI)'
+STATIC_NDPI_LIB += '$(CUSTOM_LIBNDPI)'
PROJECT_CFLAGS += '-I$(shell dirname $(CUSTOM_LIBNDPI))/../include/ndpi'
ifeq ($(findstring $*.so, $(CUSTOM_LIBNDPI)),.so)
PROJECT_CFLAGS += -Wl,-rpath='$(shell dirname $(CUSTOM_LIBNDPI))'
endif
else
+STATIC_NDPI_LIB =
CUSTOM_LIBNDPI = no
LIBS += -lndpi
endif
@@ -71,10 +72,10 @@ all: help nDPId nDPIsrvd
examples: examples/c-json-stdout/c-json-stdout examples/go-dashboard/go-dashboard
nDPId: nDPId.c utils.c
- $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $(PC_CFLAGS) $^ -o $@ $(LDFLAGS) $(PC_LDFLAGS) $(LIBS)
+ $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $(PC_CFLAGS) $^ -o $@ $(LDFLAGS) $(PC_LDFLAGS) $(STATIC_NDPI_LIB) $(LIBS)
nDPIsrvd: nDPIsrvd.c utils.c
- $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
+ $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(STATIC_NDPI_LIB) $(LIBS)
examples/c-json-stdout/c-json-stdout: examples/c-json-stdout/c-json-stdout.c
$(CC) $(PROJECT_CFLAGS) $(CFLAGS) $(JSMN_CFLAGS) $@.c -o $@ $(LDFLAGS) $(LIBS)