diff options
| author | px4dev <px4@purgatory.org> | 2013-04-26 16:14:32 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-04-26 16:14:32 -0700 |
| commit | 01e427b17c161d8adaa38d6bdb91aecb434451f2 (patch) | |
| tree | e33f4f6b78ef133c91ad92f1a413c2b16f17a5d5 /makefiles/setup.mk | |
| parent | ce0e4a3afd28b97d5a540e02bef86c52a335f243 (diff) | |
| download | px4-firmware-01e427b17c161d8adaa38d6bdb91aecb434451f2.tar.gz px4-firmware-01e427b17c161d8adaa38d6bdb91aecb434451f2.tar.bz2 px4-firmware-01e427b17c161d8adaa38d6bdb91aecb434451f2.zip | |
Merge working changes into export-build branch.
Diffstat (limited to 'makefiles/setup.mk')
| -rw-r--r-- | makefiles/setup.mk | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 8e7a00ef4..b798f7cab 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -41,7 +41,8 @@ # the number of duplicate slashes we have lying around in paths, # and is consistent with joining the results of $(dir) and $(notdir). # -export PX4_MODULE_SRC = $(abspath $(PX4_BASE)/src/modules)/ +export PX4_INCLUDE_DIR = $(abspath $(PX4_BASE)/src/include)/ +export PX4_MODULE_SRC = $(abspath $(PX4_BASE)/src)/ export PX4_MK_DIR = $(abspath $(PX4_BASE)/makefiles)/ export NUTTX_SRC = $(abspath $(PX4_BASE)/nuttx)/ export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/apps)/ @@ -52,23 +53,32 @@ export BUILD_DIR = $(abspath $(PX4_BASE)/Build)/ export ARCHIVE_DIR = $(abspath $(PX4_BASE)/Archives)/ # +# Default include paths +# +export INCLUDE_DIRS := $(PX4_MODULE_SRC) \ + $(PX4_INCLUDE_DIR) + +# Include from legacy app/library path +export INCLUDE_DIRS += $(NUTTX_APP_SRC) + +# # Tools # -MKFW = $(PX4_BASE)/Tools/px_mkfw.py -UPLOADER = $(PX4_BASE)/Tools/px_uploader.py -COPY = cp -REMOVE = rm -f -RMDIR = rm -rf -GENROMFS = genromfs -TOUCH = touch -MKDIR = mkdir -ECHO = echo -UNZIP = unzip +export MKFW = $(PX4_BASE)/Tools/px_mkfw.py +export UPLOADER = $(PX4_BASE)/Tools/px_uploader.py +export COPY = cp +export REMOVE = rm -f +export RMDIR = rm -rf +export GENROMFS = genromfs +export TOUCH = touch +export MKDIR = mkdir +export ECHO = echo +export UNZIP_CMD = unzip # # Host-specific paths, hacks and fixups # -SYSTYPE := $(shell uname -s) +export SYSTYPE := $(shell uname -s) ifeq ($(SYSTYPE),Darwin) # Eclipse may not have the toolchain on its path. |