diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 11:38:06 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 11:38:06 +0200 |
| commit | 3d6aff38da00ed71d30aeea4f9d3ae50b4606b98 (patch) | |
| tree | 1ef28357de1a1fa1775536bcdabb16453f676235 /makefiles | |
| parent | 2289c0bb216027419a9ba5e52103a1310ff03292 (diff) | |
| parent | 9d4d1ace437f94bfc517b7ff9036657fd5b2c354 (diff) | |
| download | px4-firmware-3d6aff38da00ed71d30aeea4f9d3ae50b4606b98.tar.gz px4-firmware-3d6aff38da00ed71d30aeea4f9d3ae50b4606b98.tar.bz2 px4-firmware-3d6aff38da00ed71d30aeea4f9d3ae50b4606b98.zip | |
Merged
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 2 | ||||
| -rw-r--r-- | makefiles/module.mk | 6 | ||||
| -rw-r--r-- | makefiles/nuttx.mk | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 037ebe2b9..c5ee9e642 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -30,6 +30,7 @@ MODULES += systemcmds/preflight_check MODULES += systemcmds/pwm MODULES += systemcmds/reboot MODULES += systemcmds/top +MODULES += systemcmds/tests # # General system control @@ -79,6 +80,5 @@ BUILTIN_COMMANDS := \ $(call _B, sensors, SCHED_PRIORITY_MAX-5, 4096, sensors_main ) \ $(call _B, sercon, , 2048, sercon_main ) \ $(call _B, serdis, , 2048, serdis_main ) \ - $(call _B, tests, , 12000, tests_main ) \ $(call _B, tone_alarm, , 2048, tone_alarm_main ) \ $(call _B, uorb, , 4096, uorb_main ) diff --git a/makefiles/module.mk b/makefiles/module.mk index e2a1041e0..538f6d318 100644 --- a/makefiles/module.mk +++ b/makefiles/module.mk @@ -75,6 +75,12 @@ # the list should be formatted as: # <command>.<priority>.<stacksize>.<entrypoint> # +# INCLUDE_DIRS (optional, must be appended) +# +# The list of directories searched for include files. If non-standard +# includes (e.g. those from another module) are required, paths to search +# can be added here. +# # DEFAULT_VISIBILITY (optional) # # If not set, global symbols defined in a module will not be visible diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk index 5186dc3ef..346735a02 100644 --- a/makefiles/nuttx.mk +++ b/makefiles/nuttx.mk @@ -64,8 +64,8 @@ LDSCRIPT += $(NUTTX_EXPORT_DIR)build/ld.script # Add directories from the NuttX export to the relevant search paths # INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include \ - += $(NUTTX_EXPORT_DIR)arch/chip \ - += $(NUTTX_EXPORT_DIR)arch/common + $(NUTTX_EXPORT_DIR)arch/chip \ + $(NUTTX_EXPORT_DIR)arch/common LIB_DIRS += $(NUTTX_EXPORT_DIR)libs LIBS += -lapps -lnuttx |