diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-07 16:00:59 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-07 16:00:59 +0100 |
| commit | fe279d340dccdd40ebfade4c53893e8f7a77b45e (patch) | |
| tree | 6ca7e8517507e097097a45cca384c51d343b5fc7 /Makefile | |
| parent | 417a82c699c2512ca3b8998c91c9d77f5d826edb (diff) | |
| parent | 6ed2f77ca5c713e537c8fd4a9aacd7adc7887f53 (diff) | |
| download | px4-firmware-fe279d340dccdd40ebfade4c53893e8f7a77b45e.tar.gz px4-firmware-fe279d340dccdd40ebfade4c53893e8f7a77b45e.tar.bz2 px4-firmware-fe279d340dccdd40ebfade4c53893e8f7a77b45e.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -257,6 +257,7 @@ testbuild: tests: $(Q) $(MAKE) generateuorbtopicheaders $(Q) (cd $(PX4_BASE)/unittests && $(MAKE) unittests) + $(Q) (mkdir -p $(PX4_BASE)/unittests/build && cd $(PX4_BASE)/unittests/build && cmake .. && $(MAKE) unittests) # # Cleanup targets. 'clean' should remove all built products and force |