From 01e427b17c161d8adaa38d6bdb91aecb434451f2 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 26 Apr 2013 16:14:32 -0700
Subject: Merge working changes into export-build branch.

---
 makefiles/setup.mk | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'makefiles/setup.mk')

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)/
@@ -51,24 +52,33 @@ export IMAGE_DIR	 = $(abspath $(PX4_BASE)/Images)/
 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.
-- 
cgit v1.2.3