waf: use single entry point for make wrappers

This commit is contained in:
Gustavo Jose de Sousa 2015-12-07 12:44:15 -02:00 committed by Randy Mackay
parent bbf146197c
commit dc81a2410e
4 changed files with 6 additions and 10 deletions

View File

@ -1,2 +1,2 @@
BUILD_VEHICLE = rover all:
include ../Makefile.waf @$(MAKE) -C ../ -f Makefile.waf rover

View File

@ -1,2 +1,2 @@
BUILD_VEHICLE = copter all:
include ../Makefile.waf @$(MAKE) -C ../ -f Makefile.waf copter

View File

@ -1,2 +1,2 @@
BUILD_VEHICLE = plane all:
include ../Makefile.waf @$(MAKE) -C ../ -f Makefile.waf plane

View File

@ -11,12 +11,8 @@ copter_DIR = ArduCopter
plane_DIR = ArduPlane plane_DIR = ArduPlane
rover_DIR = APMrover2 rover_DIR = APMrover2
ifneq ($(BUILD_VEHICLE),)
all: $(BUILD_VEHICLE)
else
all: $(WAF_BINARY) all: $(WAF_BINARY)
@$(WAF) build @$(WAF) build
endif
$(WAF_BINARY): $(WAF_BINARY):
@git submodule init && git submodule update @git submodule init && git submodule update