X-Git-Url: https://gerrit.fd.io/r/gitweb?p=govpp.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=6fc229bbad10147098c1274c93e55052b41284e9;hp=c2342a0c9bf43d5dbbedfb5b56c1c22a499239bd;hb=e9567fa8c853dda16c54afbd2ba99b7263fa37f1;hpb=4102c72bce694babd94a481b1201d33895a6f9c5 diff --git a/Makefile b/Makefile index c2342a0..6fc229b 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ GOVPP_PKG := git.fd.io/govpp.git VPP_API_DIR ?= ${VPP_DIR}/build-root/install-vpp-native/vpp/share/vpp/api -VERSION_PKG := $(GOVPP_PKG)/internal/version +VERSION_PKG := $(GOVPP_PKG)/version LDFLAGS = \ -X $(VERSION_PKG).version=$(VERSION) \ -X $(VERSION_PKG).commitHash=$(COMMIT) \ @@ -49,8 +49,6 @@ BINAPI_DIR ?= ./binapi # Binapi generator path BINAPI_GENERATOR = ./bin/binapi-generator -INTERNAL_BINAPI_DIR ?= ./internal/testbinapi/binapi2001 - .DEFAULT_GOAL = help check-%: @@ -110,10 +108,6 @@ generate-binapi: install-generator ## Generate binapi code @echo "# generating binapi" @go generate -x "$(BINAPI_DIR)" -.PHONY: gen-binapi-internal -gen-binapi-internal: - @go generate $(INTERNAL_BINAPI_DIR) - .PHONY: gen-binapi-local gen-binapi-local: binapi-generator check-VPP_DIR ## Generate binapi code (using locally cloned VPP) @make -C ${VPP_DIR} json-api-files