Fixed compilation of tests target in clean checkout

Moved mixer_multirotor.generated.h generation to the standalone makefile to prevent copypaste

3 files changed, 43 insertions, 14 deletions

diff --git a/src/modules/px4iofirmware/module.mk b/src/modules/px4iofirmware/module.mk
index bfcbaa9f8..cc3de09e9 100644
--- a/src/modules/px4iofirmware/module.mk
+++ b/src/modules/px4iofirmware/module.mk
@@ -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
 	
\ No newline at end of file
diff --git a/src/modules/systemlib/mixer/module.mk b/src/modules/systemlib/mixer/module.mk
index 5e818ff03..7ec77cd2f 100644
--- a/src/modules/systemlib/mixer/module.mk
+++ b/src/modules/systemlib/mixer/module.mk
@@ -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
diff --git a/src/modules/systemlib/mixer/multi_tables.mk b/src/modules/systemlib/mixer/multi_tables.mk
new file mode 100644
index 000000000..02216c3d4
--- /dev/null
+++ b/src/modules/systemlib/mixer/multi_tables.mk
@@ -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
\ No newline at end of file