waf: use single entry point for make wrappers

9 years ago · dc81a2410e
4 changed files with 6 additions and 10 deletions
--- a/APMrover2/Makefile.waf
+++ b/APMrover2/Makefile.waf
@ -1,2 +1,2 @@
				@@ -1,2 +1,2 @@
-BUILD_VEHICLE = rover
-include ../Makefile.waf
+all:
+	@$(MAKE) -C ../ -f Makefile.waf rover
--- a/ArduCopter/Makefile.waf
+++ b/ArduCopter/Makefile.waf
@ -1,2 +1,2 @@
				@@ -1,2 +1,2 @@
-BUILD_VEHICLE = copter
-include ../Makefile.waf
+all:
+	@$(MAKE) -C ../ -f Makefile.waf copter
--- a/ArduPlane/Makefile.waf
+++ b/ArduPlane/Makefile.waf
@ -1,2 +1,2 @@
				@@ -1,2 +1,2 @@
-BUILD_VEHICLE = plane
-include ../Makefile.waf
+all:
+	@$(MAKE) -C ../  -f Makefile.waf plane
--- a/Makefile.waf
+++ b/Makefile.waf
@ -11,12 +11,8 @@ copter_DIR = ArduCopter
				@@ -11,12 +11,8 @@ copter_DIR = ArduCopter
 plane_DIR = ArduPlane
 rover_DIR = APMrover2

-ifneq ($(BUILD_VEHICLE),)
-all: $(BUILD_VEHICLE)
-else
 all: $(WAF_BINARY)
 	@$(WAF) build
-endif

 $(WAF_BINARY):
 	@git submodule init && git submodule update