diff --git a/Makefile b/Makefile index 126856f78..a593f4c98 100644 --- a/Makefile +++ b/Makefile @@ -12,21 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. +.PHONY: info +info: + $(MAKE) -C $(ROOTFS) $@ + +.PHONY: gocheck ifndef GOPATH -$(error No GOPATH set) + $(error No GOPATH set) endif -include include.mk - GO_DIRS ?= $(shell glide nv -x ) GO_PKGS ?= $(shell glide nv) .PHONY: build -build: +build: gocheck @scripts/build-go.sh .PHONY: build-cross -build-cross: +build-cross: gocheck @BUILD_CROSS=1 scripts/build-go.sh .PHONY: all @@ -40,14 +43,18 @@ clean: .PHONY: test test: build test-style test-unit +ROOTFS := rootfs + .PHONY: push -push: container +push: all + $(MAKE) -C $(ROOTFS) $@ .PHONY: container -container: .project .docker +container: all + $(MAKE) -C $(ROOTFS) $@ .PHONY: test-unit -test-unit: +test-unit: @echo Running tests... go test -v $(GO_PKGS) @@ -94,12 +101,3 @@ ifndef HAS_GOX go get -u github.com/mitchellh/gox endif glide install - -.PHONY: .project -.project: - @if [[ -z "${PROJECT}" ]]; then echo "PROJECT variable must be set"; exit 1; fi - -.PHONY: .docker -.docker: - @if [[ -z `which docker` ]] || ! docker version &> /dev/null; then echo "docker is not installed correctly"; exit 1; fi - diff --git a/rootfs/Makefile b/rootfs/Makefile new file mode 100644 index 000000000..150bac8dd --- /dev/null +++ b/rootfs/Makefile @@ -0,0 +1,26 @@ +# Copyright 2015 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SUBDIRS := expandybird/. resourcifier/. manager/. +TARGETS := info push container + +SUBDIRS_TARGETS := \ + $(foreach t,$(TARGETS),$(addsuffix $t,$(SUBDIRS))) + +.PHONY : $(TARGETS) $(SUBDIRS_TARGETS) + +$(TARGETS) : % : $(addsuffix %,$(SUBDIRS)) + +$(SUBDIRS_TARGETS) : + $(MAKE) -C $(@D) $(@F:.%=%)