1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00

[OP-775] Fix Makefile variables (CDEFS, EXTRAINCDIRS, EXTRA_LIBDIRS, EXTRA_LIBS, PYTHON)

This commit is contained in:
Oleg Semyonov 2012-12-30 15:17:37 +02:00
parent aee2613384
commit 79a949e1ca
12 changed files with 41 additions and 41 deletions

View File

@ -146,7 +146,7 @@ ASRCARM =
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
EXTRAINCDIRS = $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC)
@ -174,7 +174,7 @@ EXTRAINCDIRS += $(HWDEFSINC)
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -182,7 +182,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F10X)
@ -209,7 +209,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F10X_$(MODEL)
CDEFS += -DSTM32F10X_$(MODEL)
CDEFS += -DUSE_STDPERIPH_DRIVER
CDEFS += -DUSE_$(BOARD)
ifeq ($(ENABLE_DEBUG_PINS), YES)

View File

@ -180,7 +180,7 @@ ASRCARM =
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
EXTRAINCDIRS = $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC)
@ -206,7 +206,7 @@ EXTRAINCDIRS += $(HWDEFSINC)
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -214,7 +214,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F10X)
@ -241,7 +241,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F10X_$(MODEL)
CDEFS += -DSTM32F10X_$(MODEL)
CDEFS += -DUSE_STDPERIPH_DRIVER
CDEFS += -DUSE_$(BOARD)
ifeq ($(ENABLE_DEBUG_PINS), YES)

View File

@ -114,7 +114,7 @@ EXTRAINCDIRS += $(HWDEFSINC)
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -122,7 +122,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32FXX)
@ -149,7 +149,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F4XX
CDEFS += -DSTM32F4XX
CDEFS += -DSYSCLK_FREQ=$(SYSCLK_FREQ)
CDEFS += -DHSE_VALUE=$(OSCILLATOR_FREQ)
CDEFS += -DUSE_STDPERIPH_DRIVER

View File

@ -180,7 +180,7 @@ ASRCARM =
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
EXTRAINCDIRS = $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC)
@ -206,7 +206,7 @@ EXTRAINCDIRS += $(HWDEFSINC)
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -214,7 +214,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F10X)
@ -241,7 +241,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F10X_$(MODEL)
CDEFS += -DSTM32F10X_$(MODEL)
CDEFS += -DUSE_STDPERIPH_DRIVER
CDEFS += -DUSE_$(BOARD)
ifeq ($(ENABLE_DEBUG_PINS), YES)

View File

@ -114,7 +114,7 @@ EXTRAINCDIRS += $(HWDEFSINC)
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -122,7 +122,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32FXX)
@ -149,7 +149,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F4XX
CDEFS += -DSTM32F4XX
CDEFS += -DSYSCLK_FREQ=$(SYSCLK_FREQ)
CDEFS += -DHSE_VALUE=$(OSCILLATOR_FREQ)
CDEFS += -DUSE_STDPERIPH_DRIVER

View File

@ -114,7 +114,7 @@ EXTRAINCDIRS += $(HWDEFSINC)
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -122,7 +122,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32FXX)
@ -149,7 +149,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F4XX
CDEFS += -DSTM32F4XX
CDEFS += -DSYSCLK_FREQ=$(SYSCLK_FREQ)
CDEFS += -DHSE_VALUE=$(OSCILLATOR_FREQ)
CDEFS += -DUSE_STDPERIPH_DRIVER

View File

@ -371,7 +371,7 @@ ASRCARM =
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
EXTRAINCDIRS = $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC)
@ -404,7 +404,7 @@ EXTRAINCDIRS += ${foreach MOD, ${OPTMODULES} ${MODULES}, ${OPMODULEDIR}/${MOD}/i
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -412,7 +412,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F10X)
@ -439,7 +439,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F10X_$(MODEL)
CDEFS += -DSTM32F10X_$(MODEL)
CDEFS += -DUSE_STDPERIPH_DRIVER
CDEFS += -DUSE_$(BOARD)
ifeq ($(ENABLE_DEBUG_PINS), YES)

View File

@ -255,7 +255,7 @@ ASRCARM =
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC)
@ -283,7 +283,7 @@ EXTRAINCDIRS += ${foreach MOD, ${OPTMODULES} ${MODULES}, ${OPMODULEDIR}/${MOD}/i
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -291,7 +291,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F4XX)

View File

@ -268,7 +268,7 @@ ASRCARM =
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
EXTRAINCDIRS = $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEM)
EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC)
@ -301,7 +301,7 @@ EXTRAINCDIRS += ${foreach MOD, ${OPTMODULES} ${MODULES}, ${OPMODULEDIR}/${MOD}/i
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -309,7 +309,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F10X)
@ -336,7 +336,7 @@ DEBUGF = dwarf-2
# Place project-specific -D (define) and/or
# -U options for C here.
CDEFS = -DSTM32F10X_$(MODEL)
CDEFS += -DSTM32F10X_$(MODEL)
CDEFS += -DUSE_STDPERIPH_DRIVER
CDEFS += -DUSE_$(BOARD)
ifeq ($(ENABLE_DEBUG_PINS), YES)

View File

@ -253,7 +253,7 @@ EXTRAINCDIRS += ${foreach MOD, ${MODULES} ${PYMODULES}, $(OPMODULEDIR)/${MOD}/in
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -261,7 +261,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F4XX)
@ -387,7 +387,7 @@ LDFLAGS += $(addprefix -T,$(LINKER_SCRIPTS_APP))
# Define programs and commands.
REMOVE = $(REMOVE_CMD) -f
PYHON = python
PYTHON = python
# List of all source files.
ALLSRC = $(ASRCARM) $(ASRC) $(SRCARM) $(SRC) $(CPPSRCARM) $(CPPSRC)

View File

@ -268,7 +268,7 @@ EXTRAINCDIRS += ${foreach MOD, ${OPTMODULES} ${MODULES} ${PYMODULES}, $(OPMODULE
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -276,7 +276,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
LINKERSCRIPTPATH = $(PIOSSTM32F4XX)
@ -405,7 +405,7 @@ LDFLAGS += $(addprefix -T,$(LINKER_SCRIPTS_APP))
# Define programs and commands.
REMOVE = $(REMOVE_CMD) -f
PYHON = python
PYTHON = python
# List of all source files.
ALLSRC = $(ASRCARM) $(ASRC) $(SRCARM) $(SRC) $(CPPSRCARM) $(CPPSRC)

View File

@ -229,7 +229,7 @@ EXTRAINCDIRS += ${foreach MOD, ${MODULES} ${PYMODULES}, $(OPMODULEDIR)/${MOD}/in
# Also add directories where the linker should search for
# includes from linker-script to the list
# Each directory must be seperated by a space.
EXTRA_LIBDIRS =
#EXTRA_LIBDIRS +=
# Extra Libraries
# Each library-name must be seperated by a space.
@ -237,7 +237,7 @@ EXTRA_LIBDIRS =
# EXTRA_LIBS = xyz abc efsl
# for newlib-lpc (file: libnewlibc-lpc.a):
# EXTRA_LIBS = newlib-lpc
EXTRA_LIBS =
#EXTRA_LIBS +=
# Path to Linker-Scripts
#LINKERSCRIPTPATH = $(PIOSSTM32F4XX)
@ -366,7 +366,7 @@ LDFLAGS += $(addprefix -T,$(LINKER_SCRIPTS_APP))
# Define programs and commands.
REMOVE = $(REMOVE_CMD) -f
PYHON = python
PYTHON = python
# List of all source files.
ALLSRC = $(ASRCARM) $(ASRC) $(SRCARM) $(SRC) $(CPPSRCARM) $(CPPSRC)