Recover commits lost in the previous merge. Syllableise PX4_BASE like its peers.

This commit is contained in:
px4dev
2013-02-23 22:00:58 -08:00
parent 2ebcd0fdcc
commit d2d9800c2e
4 changed files with 137 additions and 86 deletions
+6
View File
@@ -9,7 +9,12 @@
# Work out where this file is, so we can find other makefiles in the
# same directory.
#
# If PX4_BASE wasn't set previously, set it here now.
#
export PX4_MK_INCLUDE ?= $(dir $(lastword $(MAKEFILE_LIST)))
ifeq ($(PX4_BASE),)
export PX4_BASE := $(abspath $(PX4_MK_INCLUDE)/..)
endif
#
# Use the linker script from the NuttX export
@@ -36,6 +41,7 @@ include $(PX4_MK_INCLUDE)/$(PLATFORM).mk
#
# What we're going to build
#
PRODUCT_BUNDLE = $(WORK_DIR)/firmware.px4
PRODUCT_BIN = $(WORK_DIR)/firmware.bin
PRODUCT_SYM = $(WORK_DIR)/firmware.sym
PRODUCTS = $(PRODUCT_BIN) $(PRODUCT_SYM)
+2 -2
View File
@@ -2,6 +2,6 @@
# Makefile for the px4fmu_default configuration
#
SRCS = $(PX4BASE)/platforms/empty.c
SRCS = $(PX4_BASE)/platforms/empty.c
include $(PX4BASE)/makefiles/firmware.mk
include $(PX_4BASE)/makefiles/firmware.mk
+2 -2
View File
@@ -2,6 +2,6 @@
# Makefile for the px4io_default configuration
#
SRCS = $(PX4BASE)/platforms/empty.c
SRCS = $(PX4_BASE)/platforms/empty.c
include $(PX4BASE)/makefiles/firmware.mk
include $(PX4_BASE)/makefiles/firmware.mk