diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2020-09-02 18:53:39 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2020-09-02 18:57:58 +0200 |
| commit | 001f84af3b9bfd8427c99af1a380d40b6577489a (patch) | |
| tree | 66840c24bd8a23c5b933cba6046c3d2d87a72431 /Makefile | |
| parent | 0a03293d16ca0fc9f493a58748da1c43d35782e4 (diff) | |
go-dashboard: Added event structs and JSON unmarshal semantic.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -7,13 +7,12 @@ GOFLAGS = -ldflags='-s -w' ifneq ($(PKG_CONFIG_BIN),) ifneq ($(PKG_CONFIG_PREFIX),) -PC_CFLAGS=$(shell PKG_CONFIG_PATH=$(shell realpath $(PKG_CONFIG_PREFIX)) $(PKG_CONFIG_BIN) --define-prefix=$(shell realpath $(PKG_CONFIG_PREFIX)) --cflags libndpi) -PC_LDFLAGS=$(shell PKG_CONFIG_PATH=$(shell realpath $(PKG_CONFIG_PREFIX)) $(PKG_CONFIG_BIN) --define-prefix=$(shell realpath $(PKG_CONFIG_PREFIX)) --libs libndpi) -PROJECT_CFLAGS += -Wl,-rpath='$(shell realpath $(PKG_CONFIG_PREFIX)/..)' +PC_CFLAGS=$(shell PKG_CONFIG_PATH=$(shell realpath $(PKG_CONFIG_PREFIX))/lib/pkgconfig $(PKG_CONFIG_BIN) --define-variable=prefix=$(shell realpath $(PKG_CONFIG_PREFIX)) --cflags libndpi) +PC_LDFLAGS=$(shell PKG_CONFIG_PATH=$(shell realpath $(PKG_CONFIG_PREFIX))/lib/pkgconfig $(PKG_CONFIG_BIN) --define-variable=prefix=$(shell realpath $(PKG_CONFIG_PREFIX)) --libs libndpi) +PROJECT_CFLAGS += -Wl,-rpath='$(shell realpath $(PKG_CONFIG_PREFIX)/lib)' else PC_CFLAGS=$(shell $(PKG_CONFIG_BIN) --cflags libndpi) PC_LDFLAGS=$(shell $(PKG_CONFIG_BIN) --libs libndpi) -PROJECT_CFLAGS += -Wl,-rpath='$(shell realpath $(PKG_CONFIG_PREFIX)/..)' endif else @@ -66,6 +65,8 @@ ifneq ($(DISABLE_JSMN),yes) DISABLE_JSMN = no endif +GO_DASHBOARD_SRCS := examples/go-dashboard/main.go examples/go-dashboard/ui/ui.go + RM = rm -f all: help nDPId nDPIsrvd @@ -85,7 +86,7 @@ else $(CC) $(PROJECT_CFLAGS) $(CFLAGS) $@.c -o $@ $(LDFLAGS) $(LIBS) endif -examples/go-dashboard/go-dashboard: examples/go-dashboard/main.go +examples/go-dashboard/go-dashboard: $(GO_DASHBOARD_SRCS) ifneq ($(GOCC),) cd examples/go-dashboard && GO111MODULE=on $(GOCC) mod vendor cd examples/go-dashboard && GO111MODULE=on $(GOCC) build $(GOFLAGS) . |