From 21b45ae86b1525e052ea9b37e78c960498a95c72 Mon Sep 17 00:00:00 2001 From: Anton Matosov Date: Mon, 5 Jan 2015 03:18:14 +0200 Subject: [PATCH] Removed extension for multi_tables to not affect its users Fixed dependencies for the mixer_multirotor.cpp from all the modules --- src/modules/px4iofirmware/module.mk | 11 ++++++++++- src/modules/systemlib/mixer/module.mk | 4 ++-- .../systemlib/mixer/{multi_tables.py => multi_tables} | 0 3 files changed, 12 insertions(+), 3 deletions(-) rename src/modules/systemlib/mixer/{multi_tables.py => multi_tables} (100%) diff --git a/src/modules/px4iofirmware/module.mk b/src/modules/px4iofirmware/module.mk index eb99e8a966..bfcbaa9f86 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 6f4befb576..5e818ff03f 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 similarity index 100% rename from src/modules/systemlib/mixer/multi_tables.py rename to src/modules/systemlib/mixer/multi_tables