From 412bba01923285d7d28e93b95ff9c88900792d9e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 27 Nov 2015 08:47:56 +1100 Subject: [PATCH] PX4: use Makefile.make preparing for cmake build --- mk/px4_targets.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk index b19f807537..fe34cbfbf9 100644 --- a/mk/px4_targets.mk +++ b/mk/px4_targets.mk @@ -56,8 +56,8 @@ export GIT_SUBMODULES_ARE_EVIL = 1 PYTHONPATH=$(SKETCHBOOK)/mk/PX4/Tools/genmsg/src:$(SKETCHBOOK)/mk/PX4/Tools/gencpp/src export PYTHONPATH -PX4_MAKE = $(v)+ GIT_SUBMODULES_ARE_EVIL=1 ARDUPILOT_BUILD=1 $(MAKE) -C $(SKETCHBOOK) -f $(PX4_ROOT)/Makefile EXTRADEFINES="$(SKETCHFLAGS) $(WARNFLAGS) $(OPTFLAGS) "'$(EXTRAFLAGS)' APM_MODULE_DIR=$(SKETCHBOOK) SKETCHBOOK=$(SKETCHBOOK) CCACHE=$(CCACHE) PX4_ROOT=$(PX4_ROOT) NUTTX_SRC=$(NUTTX_SRC) MAXOPTIMIZATION="-Os" UAVCAN_DIR=$(UAVCAN_DIR) -PX4_MAKE_ARCHIVES = $(MAKE) -C $(PX4_ROOT) NUTTX_SRC=$(NUTTX_SRC) CCACHE=$(CCACHE) archives MAXOPTIMIZATION="-Os" +PX4_MAKE = $(v)+ GIT_SUBMODULES_ARE_EVIL=1 ARDUPILOT_BUILD=1 $(MAKE) -C $(SKETCHBOOK) -f $(PX4_ROOT)/Makefile.make EXTRADEFINES="$(SKETCHFLAGS) $(WARNFLAGS) $(OPTFLAGS) "'$(EXTRAFLAGS)' APM_MODULE_DIR=$(SKETCHBOOK) SKETCHBOOK=$(SKETCHBOOK) CCACHE=$(CCACHE) PX4_ROOT=$(PX4_ROOT) NUTTX_SRC=$(NUTTX_SRC) MAXOPTIMIZATION="-Os" UAVCAN_DIR=$(UAVCAN_DIR) +PX4_MAKE_ARCHIVES = $(MAKE) -C $(PX4_ROOT) -f $(PX4_ROOT)/Makefile.make NUTTX_SRC=$(NUTTX_SRC) CCACHE=$(CCACHE) archives MAXOPTIMIZATION="-Os" HASHADDER_FLAGS += --ardupilot "$(SKETCHBOOK)" @@ -143,7 +143,7 @@ px4-archives-clean: $(v) /bin/rm -rf $(PX4_ROOT)/Archives px4-io-v1: $(PX4_ROOT)/Archives/px4io-v1.export - $(v)+ $(MAKE) -C $(PX4_ROOT) px4io-v1_default + $(v)+ $(MAKE) -C $(PX4_ROOT) -f $(PX4_ROOT)/Makefile.make px4io-v1_default $(v) /bin/rm -f px4io-v1.bin $(v) cp $(PX4_ROOT)/Images/px4io-v1_default.bin px4io-v1.bin $(v) cp $(PX4_ROOT)/Build/px4io-v1_default.build/firmware.elf px4io-v1.elf @@ -157,7 +157,7 @@ px4-io-v1: $(PX4_ROOT)/Archives/px4io-v1.export px4-io-v2: $(PX4_ROOT)/Archives/px4io-v2.export - $(v)+ $(MAKE) -C $(PX4_ROOT) px4io-v2_default + $(v)+ $(MAKE) -C $(PX4_ROOT) -f $(PX4_ROOT)/Makefile.make px4io-v2_default $(v) /bin/rm -f px4io-v2.bin $(v) cp $(PX4_ROOT)/Build/px4io-v2_default.build/firmware.bin px4io-v2.bin $(v) cp $(PX4_ROOT)/Images/px4io-v2_default.bin px4io-v2.bin