From 13fc6703862862f4263d8d5d085b7a16b87190e1 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sun, 28 Apr 2013 09:54:11 +0200
Subject: Moved last libs, drivers and headers, cleaned up IO build

---
 makefiles/config_px4fmu_default.mk | 16 ++++++++++++++++
 makefiles/module.mk                |  2 +-
 makefiles/setup.mk                 |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'makefiles')

diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk
index 47e15b344..bc3031cd6 100644
--- a/makefiles/config_px4fmu_default.mk
+++ b/makefiles/config_px4fmu_default.mk
@@ -10,6 +10,7 @@ ROMFS_ROOT	 = $(PX4_BASE)/ROMFS/px4fmu_common
 #
 # Board support modules
 #
+MODULES		+= drivers/device
 MODULES		+= drivers/stm32
 MODULES		+= drivers/stm32/adc
 MODULES		+= drivers/stm32/tone_alarm
@@ -74,6 +75,21 @@ MODULES		+= modules/multirotor_pos_control
 #
 MODULES		+= modules/sdlog
 
+#
+# Libraries
+#
+MODULES		+= modules/systemlib
+MODULES		+= modules/systemlib/mixer
+MODULES		+= modules/mathlib
+MODULES		+= modules/mathlib/CMSIS
+MODULES		+= modules/controllib
+MODULES		+= modules/uORB
+
+#
+# Demo apps
+#
+MODULES		+= examples/math_demo
+
 #
 # Transitional support - add commands from the NuttX export archive.
 #
diff --git a/makefiles/module.mk b/makefiles/module.mk
index 253b3cd52..86810627b 100644
--- a/makefiles/module.mk
+++ b/makefiles/module.mk
@@ -186,7 +186,7 @@ define SRC_SEARCH
 	$(abspath $(firstword $(wildcard $(MODULE_SRC)/$1) MISSING_$1))
 endef
 
-ABS_SRCS		:= $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src)))
+ABS_SRCS		?= $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src)))
 MISSING_SRCS		:= $(subst MISSING_,,$(filter MISSING_%,$(ABS_SRCS)))
 ifneq ($(MISSING_SRCS),)
 $(error $(MODULE_MK): missing in SRCS: $(MISSING_SRCS))
diff --git a/makefiles/setup.mk b/makefiles/setup.mk
index b798f7cab..3c910bcfa 100644
--- a/makefiles/setup.mk
+++ b/makefiles/setup.mk
@@ -56,6 +56,7 @@ export ARCHIVE_DIR	 = $(abspath $(PX4_BASE)/Archives)/
 # Default include paths
 #
 export INCLUDE_DIRS	:= $(PX4_MODULE_SRC) \
+			   $(PX4_MODULE_SRC)/modules/ \
 			   $(PX4_INCLUDE_DIR)
 
 # Include from legacy app/library path
-- 
cgit v1.2.3