Update generated binapi to v22.02 & makefile changes

This patch does some small updates to the Makefile.
* `make gen-binapi-from-code` is removed, and moves to
`gen-binapi-local`
* `make build` is patched to build cmd & examples
* `make binapi-generator` to build the api-generator
without other binaries, as they typically require its
output to build.
* `make gen-binapi-local` runs the locally built binapi-generator
to update the local bindings. It expects ${VPP_DIR} to be set and
to point to a local vpp repository checked out with the right version
* `make gen-binapi-internal` runs the locally built binapi-generator
to update the bindings in `internal/testbinapi/binapi2001`

Regarding VPP, notable changes when moving to v22.02 are :
- ControlPing moved from vpe to memclnt
- CliInband went from vpe to vlib

Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Change-Id: Ie5cd2d5ded7ecaffd9abc3ca675df40be272b1fa

2 files changed, 12 insertions, 12 deletions

diff --git a/binapi/bier/bier.ba.go b/binapi/bier/bier.ba.go
index be06253..bcbc3eb 100644
--- a/binapi/bier/bier.ba.go
+++ b/binapi/bier/bier.ba.go
@@ -1,7 +1,7 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
 //  binapi-generator: v0.5.0-dev
-//  VPP:              21.06-release
+//  VPP:              22.02-release
 // source: /usr/share/vpp/api/core/bier.api.json
 
 // Package bier contains generated bindings for API file bier.api.
diff --git a/binapi/bier/bier_rpc.ba.go b/binapi/bier/bier_rpc.ba.go
index 5766723..80457e4 100644
--- a/binapi/bier/bier_rpc.ba.go
+++ b/binapi/bier/bier_rpc.ba.go
@@ -8,7 +8,7 @@ import (
 	"io"
 
 	api "git.fd.io/govpp.git/api"
-	vpe "git.fd.io/govpp.git/binapi/vpe"
+	memclnt "git.fd.io/govpp.git/binapi/memclnt"
 )
 
 // RPCService defines RPC service bier.
@@ -52,7 +52,7 @@ func (c *serviceClient) BierDispEntryDump(ctx context.Context, in *BierDispEntry
 	if err := x.Stream.SendMsg(in); err != nil {
 		return nil, err
 	}
-	if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
 		return nil, err
 	}
 	return x, nil
@@ -75,7 +75,7 @@ func (c *serviceClient_BierDispEntryDumpClient) Recv() (*BierDispEntryDetails, e
 	switch m := msg.(type) {
 	case *BierDispEntryDetails:
 		return m, nil
-	case *vpe.ControlPingReply:
+	case *memclnt.ControlPingReply:
 		err = c.Stream.Close()
 		if err != nil {
 			return nil, err
@@ -104,7 +104,7 @@ func (c *serviceClient) BierDispTableDump(ctx context.Context, in *BierDispTable
 	if err := x.Stream.SendMsg(in); err != nil {
 		return nil, err
 	}
-	if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
 		return nil, err
 	}
 	return x, nil
@@ -127,7 +127,7 @@ func (c *serviceClient_BierDispTableDumpClient) Recv() (*BierDispTableDetails, e
 	switch m := msg.(type) {
 	case *BierDispTableDetails:
 		return m, nil
-	case *vpe.ControlPingReply:
+	case *memclnt.ControlPingReply:
 		err = c.Stream.Close()
 		if err != nil {
 			return nil, err
@@ -165,7 +165,7 @@ func (c *serviceClient) BierImpDump(ctx context.Context, in *BierImpDump) (RPCSe
 	if err := x.Stream.SendMsg(in); err != nil {
 		return nil, err
 	}
-	if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
 		return nil, err
 	}
 	return x, nil
@@ -188,7 +188,7 @@ func (c *serviceClient_BierImpDumpClient) Recv() (*BierImpDetails, error) {
 	switch m := msg.(type) {
 	case *BierImpDetails:
 		return m, nil
-	case *vpe.ControlPingReply:
+	case *memclnt.ControlPingReply:
 		err = c.Stream.Close()
 		if err != nil {
 			return nil, err
@@ -217,7 +217,7 @@ func (c *serviceClient) BierRouteDump(ctx context.Context, in *BierRouteDump) (R
 	if err := x.Stream.SendMsg(in); err != nil {
 		return nil, err
 	}
-	if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
 		return nil, err
 	}
 	return x, nil
@@ -240,7 +240,7 @@ func (c *serviceClient_BierRouteDumpClient) Recv() (*BierRouteDetails, error) {
 	switch m := msg.(type) {
 	case *BierRouteDetails:
 		return m, nil
-	case *vpe.ControlPingReply:
+	case *memclnt.ControlPingReply:
 		err = c.Stream.Close()
 		if err != nil {
 			return nil, err
@@ -269,7 +269,7 @@ func (c *serviceClient) BierTableDump(ctx context.Context, in *BierTableDump) (R
 	if err := x.Stream.SendMsg(in); err != nil {
 		return nil, err
 	}
-	if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil {
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
 		return nil, err
 	}
 	return x, nil
@@ -292,7 +292,7 @@ func (c *serviceClient_BierTableDumpClient) Recv() (*BierTableDetails, error) {
 	switch m := msg.(type) {
 	case *BierTableDetails:
 		return m, nil
-	case *vpe.ControlPingReply:
+	case *memclnt.ControlPingReply:
 		err = c.Stream.Close()
 		if err != nil {
 			return nil, err