X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=c2ae179ee0380a59d6482b66891ab961963fc02c;hb=f4f4a8613711d724cd4dc7224e8d7a1de4b8050e;hp=1c4f97ba7fc1f61d3aed1b8a9bfc89b1c700a49f;hpb=2f75863ba9bff2d2f3488b70e441b5eefc91dfd2;p=govpp.git

diff --git a/Makefile b/Makefile
index 1c4f97b..c2ae179 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ endif
 
 GO_BUILD_TAGS ?= novpp
 
-GO_BUILD_ARGS = -ldflags "${LDFLAGS}"
+GO_BUILD_ARGS = -ldflags "$(LDFLAGS)"
 ifneq ($(GO_BUILD_TAGS),)
 GO_BUILD_ARGS += -tags="${GO_BUILD_TAGS}"
 endif
@@ -75,28 +75,34 @@ lint: ## Run code linter
 	@echo "# running linter"
 	@golint ./...
 
+install: install-generator install-proxy ## Install all
+
 install-generator: ## Install binapi-generator
 	@echo "# installing binapi-generator ${VERSION}"
 	$(GO) install ${GO_BUILD_ARGS} ./cmd/binapi-generator
 
-generate: ## Generate code
+install-proxy: ## Install vpp-proxy
+	@echo "# installing vpp-proxy ${VERSION}"
+	$(GO) install ${GO_BUILD_ARGS} ./cmd/vpp-proxy
+
+generate: ## Generate all
 	@echo "# generating code"
 	$(GO) generate -x ./...
 
-generate-binapi: install-generator
+generate-binapi: install-generator ## Generate binapi code
 	@echo "# generating binapi VPP $(VPP_VERSION)"
 	$(GO) generate -x "$(BINAPI_DIR)"
 
-gen-binapi-docker: install-generator
+gen-binapi-docker: install-generator ## Generate binapi code (using Docker)
 	@echo "# generating binapi in docker image ${VPP_IMG}"
 	$(eval cmds := $(shell go generate -n $(BINAPI_DIR) 2>&1 | tr "\n" ";"))
 	docker run -t --rm \
-		-v "$(shell which gofmt):/usr/local/bin/gofmt:ro" \
+		-e DEBUG_GOVPP \
 		-v "$(shell which binapi-generator):/usr/local/bin/binapi-generator:ro" \
 		-v "$(shell pwd):/govpp" -w /govpp \
 		-u "$(shell id -u):$(shell id -g)" \
 		"${VPP_IMG}" \
-	  sh -xc "cd $(BINAPI_DIR) && $(cmds)"
+	  sh -ec "cd $(BINAPI_DIR) && $(cmds)"
 
 extras:
 	@make -C extras
@@ -105,6 +111,7 @@ extras:
 .PHONY: help \
     build cmd examples clean \
 	lint test integration \
-	install-generator generate generate-binapi gen-binapi-docker \
+	install install-generator install-proxy \
+	generate generate-binapi gen-binapi-docker \
 	extras