From 79a949e1cabbcfed326ee077b7bdf28698959ddc Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sun, 30 Dec 2012 15:17:37 +0200 Subject: [PATCH] [OP-775] Fix Makefile variables (CDEFS, EXTRAINCDIRS, EXTRA_LIBDIRS, EXTRA_LIBS, PYTHON) --- flight/Bootloaders/BootloaderUpdater/Makefile | 8 ++++---- flight/Bootloaders/CopterControl/Makefile | 8 ++++---- flight/Bootloaders/OSD/Makefile | 6 +++--- flight/Bootloaders/PipXtreme/Makefile | 8 ++++---- flight/Bootloaders/RevoMini/Makefile | 6 +++--- flight/Bootloaders/Revolution/Makefile | 6 +++--- flight/CopterControl/Makefile | 8 ++++---- flight/OSD/Makefile | 6 +++--- flight/PipXtreme/Makefile | 8 ++++---- flight/RevoMini/Makefile | 6 +++--- flight/Revolution/Makefile | 6 +++--- flight/SimPosix/Makefile | 6 +++--- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/flight/Bootloaders/BootloaderUpdater/Makefile b/flight/Bootloaders/BootloaderUpdater/Makefile index 62fc2c056..f6ff44997 100644 --- a/flight/Bootloaders/BootloaderUpdater/Makefile +++ b/flight/Bootloaders/BootloaderUpdater/Makefile @@ -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) diff --git a/flight/Bootloaders/CopterControl/Makefile b/flight/Bootloaders/CopterControl/Makefile index 8c22d37a7..f0de64455 100644 --- a/flight/Bootloaders/CopterControl/Makefile +++ b/flight/Bootloaders/CopterControl/Makefile @@ -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) diff --git a/flight/Bootloaders/OSD/Makefile b/flight/Bootloaders/OSD/Makefile index 3742a7f24..3926779b8 100644 --- a/flight/Bootloaders/OSD/Makefile +++ b/flight/Bootloaders/OSD/Makefile @@ -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 diff --git a/flight/Bootloaders/PipXtreme/Makefile b/flight/Bootloaders/PipXtreme/Makefile index 5747a0511..c29d2abc8 100644 --- a/flight/Bootloaders/PipXtreme/Makefile +++ b/flight/Bootloaders/PipXtreme/Makefile @@ -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) diff --git a/flight/Bootloaders/RevoMini/Makefile b/flight/Bootloaders/RevoMini/Makefile index d708a6c82..b488e7b91 100644 --- a/flight/Bootloaders/RevoMini/Makefile +++ b/flight/Bootloaders/RevoMini/Makefile @@ -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 diff --git a/flight/Bootloaders/Revolution/Makefile b/flight/Bootloaders/Revolution/Makefile index d708a6c82..b488e7b91 100644 --- a/flight/Bootloaders/Revolution/Makefile +++ b/flight/Bootloaders/Revolution/Makefile @@ -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 diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile index 584210077..6a84d5426 100644 --- a/flight/CopterControl/Makefile +++ b/flight/CopterControl/Makefile @@ -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) diff --git a/flight/OSD/Makefile b/flight/OSD/Makefile index bac6235c6..7d1d24a52 100644 --- a/flight/OSD/Makefile +++ b/flight/OSD/Makefile @@ -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) diff --git a/flight/PipXtreme/Makefile b/flight/PipXtreme/Makefile index e7d53b06c..80d58cdf4 100644 --- a/flight/PipXtreme/Makefile +++ b/flight/PipXtreme/Makefile @@ -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) diff --git a/flight/RevoMini/Makefile b/flight/RevoMini/Makefile index bd2fec0a9..27505c190 100644 --- a/flight/RevoMini/Makefile +++ b/flight/RevoMini/Makefile @@ -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) diff --git a/flight/Revolution/Makefile b/flight/Revolution/Makefile index 12c8394ef..f060b33c5 100644 --- a/flight/Revolution/Makefile +++ b/flight/Revolution/Makefile @@ -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) diff --git a/flight/SimPosix/Makefile b/flight/SimPosix/Makefile index 984dfa3a4..82c814c92 100644 --- a/flight/SimPosix/Makefile +++ b/flight/SimPosix/Makefile @@ -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)