Skip to content

Commit a22d57f

Browse files
authored
Merge pull request #2 from projectcalico/code-import
Build system updates
2 parents 92289da + cffe51f commit a22d57f

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.PHONY: all build image
2+
3+
all: image
4+
5+
build:
6+
$(MAKE) -C calico-vpp-agent $@
7+
$(MAKE) -C vpp-manager $@
8+
9+
image:
10+
$(MAKE) -C calico-vpp-agent $@
11+
$(MAKE) -C vpp-manager $@

vpp-manager/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.PHONY: all build image
1+
.PHONY: all build image imageonly vpp
22

3-
VPPLINK_DIR=$(shell go list -f '{{.Dir}}' -m github.com/calico-vpp/vpplink)
3+
VPPLINK_DIR="../vpplink"
44
IMAGE_DIR=images/ubuntu/
55

66
all: image

0 commit comments

Comments
 (0)