Merge "FAB-3434 build binary files on make native target"

Makefile

@@ -19,6 +19,7 @@
 # - all (default) - builds all targets and runs all tests/checks
 # - checks - runs all tests/checks
 # - configtxgen - builds a native configtxgen binary
+# - cryptogen - builds a native cryptogen binary
 # - peer - builds a native fabric peer binary
 # - orderer - builds a native fabric orderer binary
 # - release - builds release packages for the host platform
@@ -82,6 +83,7 @@ IMAGES = peer orderer ccenv javaenv buildenv testenv zookeeper kafka couchdb
 RELEASE_PLATFORMS = windows-amd64 darwin-amd64 linux-amd64 linux-ppc64le linux-s390x
 RELEASE_PKGS = configtxgen cryptogen
 
+pkgmap.cryptogen := $(PKGNAME)/common/tools/cryptogen
 pkgmap.configtxgen := $(PKGNAME)/common/configtx/tool/configtxgen
 pkgmap.peer := $(PKGNAME)/peer
 pkgmap.orderer := $(PKGNAME)/orderer
@@ -118,6 +120,8 @@ orderer-docker: build/image/orderer/$(DUMMY)
 configtxgen: GO_TAGS+= nopkcs11
 configtxgen: build/bin/configtxgen
 
+cryptogen: build/bin/cryptogen
+
 javaenv: build/image/javaenv/$(DUMMY)
 
 buildenv: build/image/buildenv/$(DUMMY)
@@ -137,7 +141,7 @@ test-cmd:
  @echo "go test -ldflags \"$(GO_LDFLAGS)\""
 
 docker: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))
-native: peer orderer
+native: peer orderer configtxgen cryptogen
 
 BEHAVE_ENVIRONMENTS = kafka orderer orderer-1-kafka-1 orderer-1-kafka-3
 BEHAVE_ENVIRONMENT_TARGETS = $(patsubst %,bddtests/environments/%, $(BEHAVE_ENVIRONMENTS))