diff options
author | Anton Matosov <anton.matosov@gmail.com> | 2015-01-05 03:18:14 +0200 |
---|---|---|
committer | Anton Matosov <anton.matosov@gmail.com> | 2015-01-05 12:02:32 +0200 |
commit | 21b45ae86b1525e052ea9b37e78c960498a95c72 (patch) | |
tree | 9bff15449b4d5252f94849e51a61b07db3fdb438 | |
parent | 2daf30fb251c7dc8d59f0302ecb444b116081931 (diff) | |
download | px4-firmware-21b45ae86b1525e052ea9b37e78c960498a95c72.tar.gz px4-firmware-21b45ae86b1525e052ea9b37e78c960498a95c72.tar.bz2 px4-firmware-21b45ae86b1525e052ea9b37e78c960498a95c72.zip |
Removed extension for multi_tables to not affect its users
Fixed dependencies for the mixer_multirotor.cpp from all the modules
-rw-r--r-- | src/modules/px4iofirmware/module.mk | 11 | ||||
-rw-r--r-- | src/modules/systemlib/mixer/module.mk | 4 | ||||
-rwxr-xr-x | src/modules/systemlib/mixer/multi_tables (renamed from src/modules/systemlib/mixer/multi_tables.py) | 0 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/modules/px4iofirmware/module.mk b/src/modules/px4iofirmware/module.mk index eb99e8a96..bfcbaa9f8 100644 --- a/src/modules/px4iofirmware/module.mk +++ b/src/modules/px4iofirmware/module.mk @@ -1,5 +1,4 @@ - SRCS = adc.c \ controls.c \ dsm.c \ @@ -24,3 +23,13 @@ ifeq ($(BOARD),px4io-v2) SRCS += serial.c \ ../systemlib/hx_stream.c endif + +SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) +MIXER_DIR:=$(SELF_DIR)../systemlib/mixer/ + +# Add explicit dependency, as implicit one doesn't work often. +$(MIXER_DIR)mixer_multirotor.cpp : $(MIXER_DIR)mixer_multirotor.generated.h + +$(MIXER_DIR)mixer_multirotor.generated.h : $(MIXER_DIR)multi_tables + $(MIXER_DIR)multi_tables > $(MIXER_DIR)mixer_multirotor.generated.h +
\ No newline at end of file diff --git a/src/modules/systemlib/mixer/module.mk b/src/modules/systemlib/mixer/module.mk index 6f4befb57..5e818ff03 100644 --- a/src/modules/systemlib/mixer/module.mk +++ b/src/modules/systemlib/mixer/module.mk @@ -46,7 +46,7 @@ SRCS = mixer.cpp \ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) # Add explicit dependency, as implicit one doesn't work often. -mixer_multirotor.cpp : $(SELF_DIR)mixer_multirotor.generated.h +$(SELF_DIR)mixer_multirotor.cpp : $(SELF_DIR)mixer_multirotor.generated.h $(SELF_DIR)mixer_multirotor.generated.h : $(SELF_DIR)multi_tables - $(SELF_DIR)multi_tables > $(SELF_DIR)mixer_multirotor.generated.h + $(SELF_DIR)multi_tables> $(SELF_DIR)mixer_multirotor.generated.h diff --git a/src/modules/systemlib/mixer/multi_tables.py b/src/modules/systemlib/mixer/multi_tables index 07594ee72..07594ee72 100755 --- a/src/modules/systemlib/mixer/multi_tables.py +++ b/src/modules/systemlib/mixer/multi_tables |