diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 09:54:11 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 09:54:11 +0200 |
| commit | 13fc6703862862f4263d8d5d085b7a16b87190e1 (patch) | |
| tree | 47f3a17cb6f38b1aafe22e1cdef085cd73cd3a1d /makefiles | |
| parent | f57439b90e23de260259dec051d3e2ead2d61c8c (diff) | |
| download | px4-firmware-13fc6703862862f4263d8d5d085b7a16b87190e1.tar.gz px4-firmware-13fc6703862862f4263d8d5d085b7a16b87190e1.tar.bz2 px4-firmware-13fc6703862862f4263d8d5d085b7a16b87190e1.zip | |
Moved last libs, drivers and headers, cleaned up IO build
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 16 | ||||
| -rw-r--r-- | makefiles/module.mk | 2 | ||||
| -rw-r--r-- | makefiles/setup.mk | 1 |
3 files changed, 18 insertions, 1 deletions
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 @@ -75,6 +76,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. # # In general, these should move to modules over time. 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 |