diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2020-11-19 19:34:11 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2020-12-01 10:22:47 +0100 |
| commit | f8692c6be11c664e4345ceaaec5c6b35ba9b3feb (patch) | |
| tree | 5f19272d7bef0f3f0413e973f988ba44c91e87d5 /Makefile | |
| parent | a9b87e573964603e3932b4995b6045ed2f91bdc5 (diff) | |
Let travis use pcap files from nDPI to produce some JSON output. (disabled, needs further testing..)
* Added pcap diff script
* Added \n to JSON string end (useful for debugging and readability)
* Use first host/server name character for hash calculation as well
* Removed error'ing EPOLLHUP handling in nDPIsrvd (connection closing will be detected via read())
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -32,7 +32,6 @@ ifeq ($(findstring $*.so, $(CUSTOM_LIBNDPI)),.so) PROJECT_CFLAGS += -Wl,-rpath='$(shell dirname $(CUSTOM_LIBNDPI))' endif else -STATIC_NDPI_LIB = LIBS += -lndpi endif @@ -55,8 +54,13 @@ endif GO_DASHBOARD_SRCS := examples/go-dashboard/main.go examples/go-dashboard/ui/ui.go RM = rm -f +INSTALL = install -all: help nDPId nDPIsrvd +ifeq ($(ENABLE_DEBUG),yes) +INSTALL_ARGS = -s +endif + +all: help nDPId nDPIsrvd examples examples: examples/c-captured/c-captured examples/c-json-stdout/c-json-stdout examples/go-dashboard/go-dashboard @@ -85,9 +89,14 @@ ifneq ($(GOCC),) cd examples/go-dashboard && GO111MODULE=on $(GOCC) mod vendor cd examples/go-dashboard && GO111MODULE=on $(GOCC) build $(GOFLAGS) . else - @echo '*** Not building examples/c-captured/c-captured as it requires GOCC to be set ***' + @echo '*** Not building examples/go-dashboard/go-dashboard as it requires GOCC to be set ***' endif +install: all + $(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin' '$(DESTDIR)$(PREFIX)/sbin' + $(INSTALL) $(INSTALL_ARGS) -t '$(DESTDIR)$(PREFIX)/bin' nDPIsrvd + $(INSTALL) $(INSTALL_ARGS) -t '$(DESTDIR)$(PREFIX)/sbin' nDPId + clean: $(RM) -f nDPId nDPIsrvd examples/c-captured/c-captured examples/c-json-stdout/c-json-stdout examples/go-dashboard/go-dashboard @@ -139,4 +148,4 @@ else endif @echo '------------------------------------' -.PHONY: all clean help +.PHONY: all examples install clean help |