fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-23 17:27:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation of tests target in clean checkout

Browse Source 
Moved mixer_multirotor.generated.h generation to the standalone makefile to prevent copypaste
This commit is contained in:
Anton Matosov
2015-01-05 12:37:05 +02:00
parent 21b45ae86b
commit 1bc6c44a0e
4 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/px4iofirmware/module.mk
+1 -7
View File
@@ -24,12 +24,6 @@ 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
include ../systemlib/mixer/multi_tables.mk
src/modules/systemlib/mixer/module.mk
+1 -7
View File
@@ -43,10 +43,4 @@ SRCS = mixer.cpp \
mixer_simple.cpp \
mixer_load.c
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
# Add explicit dependency, as implicit one doesn't work often.
$(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
include multi_tables.mk
src/modules/systemlib/mixer/multi_tables.mk
+41
View File
@@ -0,0 +1,41 @@
############################################################################
#
# Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name PX4 nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
# Add explicit dependency, as implicit one doesn't work often.
$(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
unittests/Makefile
+2
View File
@@ -53,6 +53,8 @@ MIXER_FILES=../src/systemcmds/tests/test_mixer.cpp \
hrt.cpp \
mixer_test.cpp
include ../src/modules/systemlib/mixer/multi_tables.mk
SBUS2_FILES=../src/modules/px4iofirmware/sbus.c \
hrt.cpp \
sbus2_test.cpp