Skip to content

Build system updates #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2020
Merged

Build system updates #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.PHONY: all build image

all: image

build:
$(MAKE) -C calico-vpp-agent $@
$(MAKE) -C vpp-manager $@

image:
$(MAKE) -C calico-vpp-agent $@
$(MAKE) -C vpp-manager $@
0 etc/service/calico-vpp-agent/log/run → ...gent/etc/service/calico-vpp-agent/log/run
View file
Open in desktop
File renamed without changes.
0 etc/service/calico-vpp-agent/run → ...pp-agent/etc/service/calico-vpp-agent/run
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions vpp-manager/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all build image
.PHONY: all build image imageonly vpp

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

all: image
Expand Down