diff options
| author | px4dev <px4@purgatory.org> | 2013-02-23 12:23:34 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-02-23 22:01:00 -0800 |
| commit | d24599931a3d68586cc62eddd8ffc4e309ba1606 (patch) | |
| tree | 8403f18661dd728b6b89c977788fe2ecabc8501c /makefiles/nuttx.mk | |
| parent | 8d7621079aa123d1d8e44ae4fd628bb1be72eb1f (diff) | |
| download | px4-firmware-d24599931a3d68586cc62eddd8ffc4e309ba1606.tar.gz px4-firmware-d24599931a3d68586cc62eddd8ffc4e309ba1606.tar.bz2 px4-firmware-d24599931a3d68586cc62eddd8ffc4e309ba1606.zip | |
APP -> MODULE
remove as many duplicate slashes, etc. as seems practical
Diffstat (limited to 'makefiles/nuttx.mk')
| -rw-r--r-- | makefiles/nuttx.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/makefiles/nuttx.mk b/makefiles/nuttx.mk index cdbd6e0af..bd2b98084 100644 --- a/makefiles/nuttx.mk +++ b/makefiles/nuttx.mk @@ -6,7 +6,7 @@ # # Check that the NuttX archive for the selected board is available. # -NUTTX_ARCHIVE := $(wildcard $(ARCHIVE_DIR)/$(BOARD).export) +NUTTX_ARCHIVE := $(wildcard $(ARCHIVE_DIR)$(BOARD).export) ifeq ($(NUTTX_ARCHIVE),) $(error The NuttX export archive for $(BOARD) is missing from $(ARCHIVE_DIR) - try 'make archives' in $(PX4_BASE)) endif @@ -16,23 +16,27 @@ endif # if it changes, everything should be rebuilt. So, use it as the trigger to # unpack the NuttX archive. # -NUTTX_EXPORT_DIR = $(WORK_DIR)/nuttx-export -NUTTX_CONFIG_HEADER = $(NUTTX_EXPORT_DIR)/include/nuttx/config.h +NUTTX_EXPORT_DIR = $(WORK_DIR)nuttx-export/ +NUTTX_CONFIG_HEADER = $(NUTTX_EXPORT_DIR)include/nuttx/config.h +$(info NUTTX_EXPORT_DIR $(NUTTX_EXPORT_DIR)) +$(info NUTTX_CONFIG_HEADER $(NUTTX_CONFIG_HEADER)) + + GLOBAL_DEPS += $(NUTTX_CONFIG_HEADER) # # Use the linker script from the NuttX export # -LDSCRIPT = $(NUTTX_EXPORT_DIR)/build/ld.script +LDSCRIPT = $(NUTTX_EXPORT_DIR)build/ld.script # # Add directories from the NuttX export to the relevant search paths # -INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)/include -LIB_DIRS += $(NUTTX_EXPORT_DIR)/libs +INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include +LIB_DIRS += $(NUTTX_EXPORT_DIR)libs LIBS += -lapps -lnuttx -LINK_DEPS += $(NUTTX_EXPORT_DIR)/libs/libapps.a \ - $(NUTTX_EXPORT_DIR)/libs/libnuttx.a +LINK_DEPS += $(NUTTX_EXPORT_DIR)libs/libapps.a \ + $(NUTTX_EXPORT_DIR)libs/libnuttx.a $(NUTTX_CONFIG_HEADER): $(NUTTX_ARCHIVE) @echo %% Unpacking $(NUTTX_ARCHIVE) |