Merged export-build

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
@@ -75,6 +76,32 @@ 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
+# Tutorial code from
+# https://pixhawk.ethz.ch/px4/dev/hello_sky
+#MODULES		+= examples/px4_simple_app
+
+# Tutorial code from
+# https://pixhawk.ethz.ch/px4/dev/daemon
+#MODULES		+= examples/px4_daemon_app
+
+# Tutorial code from
+# https://pixhawk.ethz.ch/px4/dev/debug_values
+#MODULES		+= examples/px4_mavlink_debug
+
 #
 # Transitional support - add commands from the NuttX export archive.
 #

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))

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