diff options
| author | px4dev <px4@purgatory.org> | 2013-01-11 02:14:43 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-11 02:14:43 -0800 |
| commit | f127495caa2d45a1b1fff3be7a9d3756259d23e2 (patch) | |
| tree | 91daf599eae326f2207d0fbd9ede34b51eca1812 /Makefile | |
| parent | 48c5d63319be3b8da7c4cd598d2a31dceae842a7 (diff) | |
| download | px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.gz px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.bz2 px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.zip | |
Manually fixup merge botches via direct comparison with NuttX r5447.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -28,7 +28,9 @@ UPLOADER = $(PX4BASE)/Tools/px_uploader.py # What are we currently configured for? # CONFIGURED = $(PX4BASE)/.configured +ifneq ($(wildcard $(CONFIGURED)),) export TARGET := $(shell cat $(CONFIGURED)) +endif # # What we will build @@ -40,8 +42,8 @@ FIRMWARE_PROTOTYPE = $(IMAGE_DIR)/$(TARGET).prototype # # Debugging # -MQUIET = --no-print-directory -#MQUIET = --print-directory +#MQUIET = --no-print-directory +MQUIET = --print-directory all: $(FIRMWARE_BUNDLE) |