From 1e983c96702124d39b875ae8b67e8e1a5f5dcade Mon Sep 17 00:00:00 2001
From: Thomas Eichinger <thomas.eichinger1@gmail.com>
Date: Fri, 23 May 2014 10:33:02 +0200
Subject: [PATCH] s/PROJECT/APPLICATION/g
fixes #548
---
Makefile.buildtests | 2 +-
Makefile.include | 20 ++++++++--------
boards/arduino-due/Makefile.include | 2 +-
boards/chronos/Makefile.include | 2 +-
boards/mbed_lpc1768/Makefile.include | 4 ++--
boards/msb-430-common/Makefile.include | 2 +-
boards/msba2-common/Makefile.include | 2 +-
boards/native/Makefile.include | 2 +-
boards/qemu-i386/Makefile.include | 2 +-
boards/redbee-econotag/Makefile.include | 2 +-
boards/telosb/Makefile.include | 2 +-
boards/udoo/Makefile.include | 2 +-
boards/wsn430-common/Makefile.include | 2 +-
boards/z1/Makefile.include | 2 +-
cpu/lpc1768/Makefile | 6 ++---
dist/Makefile | 2 +-
dist/tools/linux-border_router/Doxyfile | 22 +++++++++---------
dist/tools/testsuite/run_tests.sh | 10 ++++----
doc/doxygen/src/mainpage.txt | 4 ++--
examples/ccn-lite-client/Makefile | 2 +-
examples/ccn-lite-relay/Makefile | 2 +-
examples/default/Makefile | 2 +-
examples/hello-world/Makefile | 2 +-
examples/ipc_pingpong/Makefile | 2 +-
examples/rpl_udp/Makefile | 2 +-
pkg/oonf_api/0002-port-tests-to-riot.patch | Bin 5913 -> 5929 bytes
pkg/oonf_api/0003-port-example-to-riot.patch | Bin 2423 -> 2427 bytes
tests/test_bloom/Makefile | 2 +-
tests/test_bloom_bytes/Makefile | 2 +-
tests/test_disable_module/Makefile | 2 +-
tests/test_float/Makefile | 2 +-
tests/test_hwtimer/Makefile | 2 +-
tests/test_hwtimer_spin/Makefile | 2 +-
tests/test_hwtimer_wait/Makefile | 2 +-
tests/test_irq/Makefile | 2 +-
tests/test_mutex_unlock_and_sleep/Makefile | 2 +-
tests/test_nativenet/Makefile | 4 ++--
tests/test_net_if/Makefile | 2 +-
tests/test_pnet/Makefile | 2 +-
tests/test_posix_semaphore/Makefile | 2 +-
tests/test_posix_sleep/Makefile | 2 +-
tests/test_pthread/Makefile | 2 +-
tests/test_pthread_barrier/Makefile | 2 +-
tests/test_pthread_cleanup/Makefile | 2 +-
.../test_pthread_condition_variable/Makefile | 2 +-
tests/test_pthread_cooperation/Makefile | 2 +-
tests/test_pthread_rwlock/Makefile | 2 +-
tests/test_queue_fairness/Makefile | 2 +-
tests/test_sha256/Makefile | 2 +-
tests/test_shell/Makefile | 2 +-
tests/test_thread_basic/Makefile | 2 +-
tests/test_thread_cooperation/Makefile | 2 +-
tests/test_thread_exit/Makefile | 2 +-
tests/test_thread_msg/Makefile | 2 +-
tests/test_thread_msg_block_w_queue/Makefile | 2 +-
tests/test_thread_msg_block_wo_queue/Makefile | 2 +-
tests/test_thread_msg_seq/Makefile | 2 +-
tests/test_vtimer_msg/Makefile | 2 +-
tests/unittests/Makefile | 2 +-
59 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/Makefile.buildtests b/Makefile.buildtests
index 6a705b3900..6463decc92 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -84,7 +84,7 @@ objsize:
sort -rnk$${SORTROW}
buildsize:
- @$(SIZE) -dB $(BINDIR)$(PROJECT).elf
+ @$(SIZE) -dB $(BINDIR)$(APPLICATION).elf
buildsizes: SHELL=bash
buildsizes:
diff --git a/Makefile.include b/Makefile.include
index 98b9430845..ccf83d607d 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -62,24 +62,24 @@ include $(RIOTBASE)/Makefile.cflags
# the binaries to link
BASELIBS += $(BINDIR)$(BOARD)_base.a
-BASELIBS += $(BINDIR)${PROJECT}.a
+BASELIBS += $(BINDIR)${APPLICATION}.a
BASELIBS += $(USEPKG:%=${BINDIR}%.a)
.PHONY: all clean flash doc term objsize buildsize buildsizes buildsizes-diff
-export ELFFILE ?= $(BINDIR)$(PROJECT).elf
+export ELFFILE ?= $(BINDIR)$(APPLICATION).elf
export HEXFILE ?= $(ELFFILE:.elf=.hex)
-## make script for the application
-all: $(BINDIR)$(PROJECT).a
- @echo "Building application $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
+## make script for your application. Build RIOT-base here!
+all: $(BINDIR)$(APPLICATION).a
+ @echo "Building application $(APPLICATION) for $(BOARD) w/ MCU $(MCU)."
"$(MAKE)" -C $(RIOTBOARD)/$(BOARD)
"$(MAKE)" -C $(RIOTBASE)
ifeq (,$(RIOTNOLINK))
ifeq ($(BUILDOSXNATIVE),1)
$(AD)$(LINK) $(UNDEF) -o $(ELFFILE) $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie
else
- $(AD)$(LINK) $(UNDEF) -o $(ELFFILE) -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(PROJECT).map $(LINKFLAGS)
+ $(AD)$(LINK) $(UNDEF) -o $(ELFFILE) -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(APPLICATION).map $(LINKFLAGS)
endif
$(AD)$(SIZE) $(ELFFILE)
$(AD)$(OBJCOPY) $(OFLAGS) $(ELFFILE) $(HEXFILE)
@@ -89,10 +89,10 @@ endif
SRC = $(wildcard *.c)
# string array of all names replaced .c with .o
-OBJ = $(SRC:%.c=${BINDIR}${PROJECT}/%.o)
+OBJ = $(SRC:%.c=${BINDIR}${APPLICATION}/%.o)
-$(BINDIR)$(PROJECT).a: $(OBJ)
- $(AD)$(AR) -rc $(BINDIR)$(PROJECT).a $(OBJ)
+$(BINDIR)$(APPLICATION).a: $(OBJ)
+ $(AD)$(AR) -rc $(BINDIR)$(APPLICATION).a $(OBJ)
# add extra include paths for packages in $(USEMODULE)
export USEMODULE_INCLUDES =
@@ -120,7 +120,7 @@ $(RIOTBASE)/pkg/%/Makefile.include::
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
-$(BINDIR)$(PROJECT)/%.o: %.c $(PROJDEPS) $(USEPKG:%=${BINDIR}%.a)
+$(BINDIR)$(APPLICATION)/%.o: %.c $(PROJDEPS) $(USEPKG:%=${BINDIR}%.a)
@echo; echo "Compiling.... $*.c"; echo
$(AD)mkdir -p "$(dir $@)"
$(AD)$(CC) $(CFLAGS) $(INCLUDES) -c "$<" -o "$@"
diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include
index 9596c37a02..987a18f5f4 100644
--- a/boards/arduino-due/Makefile.include
+++ b/boards/arduino-due/Makefile.include
@@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
# linkerscript specified in cpu/Makefile.include
export LINKFLAGS += -T$(LINKERSCRIPT)
export OFLAGS += -O binary
-export FFLAGS += -e -w -v -b bin/$(BOARD)/$(PROJECT).hex
+export FFLAGS += -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
# additional compiler and linker flags to enable newlib-nano and optimize for it
# CAREFUL: newlib-nano is not supported by the ubuntu arm-none-eabi- toolchain, so its disabled by default
diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index ab942e931a..5289a39000 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -16,7 +16,7 @@ export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o
export FLASHER = mspdebug
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export USEMODULE += msp430_common
export FFLAGS = rf2500 "prog $(HEXFILE)"
export OFLAGS = -O ihex
diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include
index 10c3b2a92c..668c6e8cde 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -17,10 +17,10 @@ LINKFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys -
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = $(HEXFILE)
-export ELFFILE = bin/$(PROJECT).elf
+export ELFFILE = bin/$(APPLICATION).elf
export DEBUGGER_FLAGS = $(ELFFILE)
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ -I$(RIOTCPU)/$(CPU)/include
diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 303bbfa4dc..fd041ac834 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -14,7 +14,7 @@ export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc
TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FLASHER ?= mspdebug
export PORT ?= /dev/ttyUSB0
diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include
index e0cad03fd2..6dec003d4d 100644
--- a/boards/msba2-common/Makefile.include
+++ b/boards/msba2-common/Makefile.include
@@ -19,7 +19,7 @@ LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = $(PORT) $(HEXFILE)
include $(RIOTBOARD)/msba2-common/Makefile.dep
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
index d1c9f5bd6e..cd76950f1a 100644
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@@ -5,7 +5,7 @@ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
export CPU = native
-export ELF = $(BINDIR)$(PROJECT).elf
+export ELF = $(BINDIR)$(APPLICATION).elf
# toolchain:
export PREFIX =
diff --git a/boards/qemu-i386/Makefile.include b/boards/qemu-i386/Makefile.include
index 5e3d17ce02..85db0b12a2 100644
--- a/boards/qemu-i386/Makefile.include
+++ b/boards/qemu-i386/Makefile.include
@@ -3,5 +3,5 @@ include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
CFLAGS += -march=i686 -mtune=i686
CFLAGS += -I$(RIOTBOARD)/qemu-i386/include
-TERMPROG = qemu-system-i386 -m 512m -serial stdio -nographic -monitor /dev/null -kernel $(BINDIR)/$(PROJECT).hex
+TERMPROG = qemu-system-i386 -m 512m -serial stdio -nographic -monitor /dev/null -kernel $(BINDIR)/$(APPLICATION).hex
FLASHER = true
diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include
index 80ade37401..9e65dea93d 100644
--- a/boards/redbee-econotag/Makefile.include
+++ b/boards/redbee-econotag/Makefile.include
@@ -24,7 +24,7 @@ LINKFLAGS = -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
-export HEXFILE = $(BINDIR)/$(PROJECT).hex
+export HEXFILE = $(BINDIR)/$(APPLICATION).hex
export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
export OFLAGS = -O binary --gap-fill=0xff
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index 8bf7773c65..174ea8f173 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -19,7 +19,7 @@ export FLASHER = goodfet.bsl
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
export INCLUDES += -I$(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include
index 1cbf8009f9..57805b7189 100644
--- a/boards/udoo/Makefile.include
+++ b/boards/udoo/Makefile.include
@@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
# linkerscript specified in cpu/Makefile.include
export LINKFLAGS += -T$(LINKERSCRIPT)
export OFLAGS += -O binary
-export FFLAGS += -e -w -v -b bin/$(BOARD)/$(PROJECT).hex
+export FFLAGS += -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
# additional linker and compiler flags to enable and optimize for newlib-nano
# ATTENTION: since the newlib nano specs are not installed by default for all arm-none-eabi- tool-chains,
diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include
index 8a2b96bdec..fd182fd80b 100644
--- a/boards/wsn430-common/Makefile.include
+++ b/boards/wsn430-common/Makefile.include
@@ -17,7 +17,7 @@ export FLASHER = mspdebug
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index be085a42fb..eb4a5023f6 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -19,7 +19,7 @@ export FLASHER = goodfet.bsl
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
-export HEXFILE = $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
export OFLAGS = -O ihex
diff --git a/cpu/lpc1768/Makefile b/cpu/lpc1768/Makefile
index 29d947056f..92826d6a5b 100644
--- a/cpu/lpc1768/Makefile
+++ b/cpu/lpc1768/Makefile
@@ -4,7 +4,7 @@ OBJECTS = system_LPC17xx.o startup_LPC17xx.o main.o
CC_SYMBOLS = -DTARGET_LPC1769 -DTOOLCHAIN_GCC_ARM -DNDEBUG -D__CORTEX_M3
-LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(PROJECT).map,--cref --specs=nano.specs
+LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(APPLICATION).map,--cref --specs=nano.specs
LD_SYS_LIBS = -lc -lgcc -lnosys
all: $(BINDIR)$(MODULE).a
@@ -15,10 +15,10 @@ include $(RIOTBASE)/Makefile.base
nxpsum:
$(CCLOCAL) nxpsum.c -std=c99 -o nxpsum
-#$(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS)
+#$(APPLICATION).elf: $(OBJECTS) $(SYS_OBJECTS)
# $(LD) $(LD_FLAGS) -T$(LINKER_SCRIPT) $(LIBRARY_PATHS) -o $@ $(addprefix $(BUILD_DIR), $^) $(LIBRARIES) $(LD_SYS_LIBS) $(LIBRARIES) $(LD_SYS_LIBS)
-$(PROJECT).bin: $(PROJECT).elf nxpsum
+$(APPLICATION).bin: $(APPLICATION).elf nxpsum
$(OBJCOPY) -O binary $< $@
# Compute nxp checksum on .bin file here
./nxpsum $@
diff --git a/dist/Makefile b/dist/Makefile
index 1ff2c2e500..f1070aa8ad 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -7,7 +7,7 @@
####
# Set the name of your application:
-export PROJECT = foobar
+export APPLICATION = foobar
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/dist/tools/linux-border_router/Doxyfile b/dist/tools/linux-border_router/Doxyfile
index 5ff2a31d3a..6873493a50 100644
--- a/dist/tools/linux-border_router/Doxyfile
+++ b/dist/tools/linux-border_router/Doxyfile
@@ -22,32 +22,32 @@
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = "6LoWPAN Border Router linux driver"
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER =
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF =
+PROJECT_BRIEF =
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
-PROJECT_LOGO =
+PROJECT_LOGO =
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
diff --git a/dist/tools/testsuite/run_tests.sh b/dist/tools/testsuite/run_tests.sh
index cdf4e21353..993b40432c 100755
--- a/dist/tools/testsuite/run_tests.sh
+++ b/dist/tools/testsuite/run_tests.sh
@@ -9,7 +9,7 @@ flash() {
run_tests() {
TESTDIR=projects/${1}/tests
- flash ${PROJECT} || return
+ flash ${APPLICATION} || return
for tst in `ls ${TESTDIR}/`; do
echo "Project \"${1}\": Running test ${tst}..."
$TESTDIR/$tst || (
@@ -24,17 +24,17 @@ echo "Running tests..."
echo
for i in projects/*; do
- export PROJECT=`basename $i`
- if [ -d projects/${PROJECT}/tests ]; then
+ export APPLICATION=`basename $i`
+ if [ -d projects/${APPLICATION}/tests ]; then
{
- echo "Testing project ${PROJECT}..."
+ echo "Testing project ${APPLICATION}..."
PORT="`sh ${TOOLROOT}/tools/lock_board.sh`"
FLASHUTIL_SHELL="sh -c"
echo "Using Target connecting to ${PORT}."
export PORT FLASHUTIL_SHELL
- run_tests ${PROJECT}
+ run_tests ${APPLICATION}
sh ${TOOLROOT}/tools/unlock_board.sh ${PORT}
} 2>&1
diff --git a/doc/doxygen/src/mainpage.txt b/doc/doxygen/src/mainpage.txt
index ad72867178..c249bd46ed 100644
--- a/doc/doxygen/src/mainpage.txt
+++ b/doc/doxygen/src/mainpage.txt
@@ -70,12 +70,12 @@
* RIOT uses GNU make as build system. The simplest way to compile and link a
* application (application or library) with RIOT, is to set up a Makefile providing
* at least the following variables:
- * * PROJECT
+ * * APPLICATION
* * BOARD
* * RIOTBASE
*
* and an instruction to include the `Makefile.include`, located in RIOT's root
- * directory. `PROJECT` should contain the (unique) name of your application, `BOARD`
+ * directory. `APPLICATION` should contain the (unique) name of your application, `BOARD`
* specifies the platform the application should be built for by default, and
* `RIOTBASE` specifies the path to your copy of the RIOT repository (note, that
* you may want to use `$(CURDIR)` here, to give a relative path). You can use Make's
diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile
index 60a4ea55db..7f130a7194 100644
--- a/examples/ccn-lite-client/Makefile
+++ b/examples/ccn-lite-client/Makefile
@@ -1,5 +1,5 @@
# name of your application
-export PROJECT = ccn-lite-client
+export APPLICATION = ccn-lite-client
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile
index 9dc91a7d4d..1f02afb00e 100644
--- a/examples/ccn-lite-relay/Makefile
+++ b/examples/ccn-lite-relay/Makefile
@@ -1,5 +1,5 @@
# name of your application
-export PROJECT = ccn-lite-relay
+export APPLICATION = ccn-lite-relay
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/examples/default/Makefile b/examples/default/Makefile
index b1b135e65c..d7c34e406c 100644
--- a/examples/default/Makefile
+++ b/examples/default/Makefile
@@ -1,5 +1,5 @@
# name of your application
-export PROJECT = default
+export APPLICATION = default
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/examples/hello-world/Makefile b/examples/hello-world/Makefile
index d7062d96c6..366de1d91b 100644
--- a/examples/hello-world/Makefile
+++ b/examples/hello-world/Makefile
@@ -1,5 +1,5 @@
# name of your application
-export PROJECT = hello-world
+export APPLICATION = hello-world
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/examples/ipc_pingpong/Makefile b/examples/ipc_pingpong/Makefile
index 85d482d931..af71faeef6 100644
--- a/examples/ipc_pingpong/Makefile
+++ b/examples/ipc_pingpong/Makefile
@@ -1,5 +1,5 @@
# name of your application
-export PROJECT = ipc_pingpong
+export APPLICATION = ipc_pingpong
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/examples/rpl_udp/Makefile b/examples/rpl_udp/Makefile
index 8c7e79f4f2..32050d9386 100644
--- a/examples/rpl_udp/Makefile
+++ b/examples/rpl_udp/Makefile
@@ -1,5 +1,5 @@
# name of your application
-export PROJECT = rpl_udp
+export APPLICATION = rpl_udp
# If no BOARD is found in the environment, use this default:
export BOARD ?= native
diff --git a/pkg/oonf_api/0002-port-tests-to-riot.patch b/pkg/oonf_api/0002-port-tests-to-riot.patch
index 766fc2f52793cd356c3ba408a535724fcfc3037a..dd861e024deaae89479e9a89279cceaa7adabd82 100644
GIT binary patch
delta 79
zcmbQKw^DCIC>yt9K!A^@vtx*-zu)E<wkwRt0+Y=-l9BnF7jn$vKoN*x+s?T8r;q{*
E0L_pXasU7T
delta 63
zcmZ3fH&bszC>wh~kiVC!bI9fdwkwP<&SZOzWEgw%T8>#9a83f-cE-(|!U`+^eOMD4
diff --git a/pkg/oonf_api/0003-port-example-to-riot.patch b/pkg/oonf_api/0003-port-example-to-riot.patch
index 30737a5ece974338113d41282f5d1935af939a0d..0ce878b0f12a62ecfc40302e288df6b5de3abf1a 100644
GIT binary patch
delta 24
fcmew^^jl~{H8ZzkK!A^@vtx*-zu)F2=C7;(az_ZZ
delta 20
bcmew@^j&B}H8XoakiVC!bI9g4=C7;(RLTdL
diff --git a/tests/test_bloom/Makefile b/tests/test_bloom/Makefile
index c119c007e8..1dd789157c 100644
--- a/tests/test_bloom/Makefile
+++ b/tests/test_bloom/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_bloom
+export APPLICATION = test_bloom
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos mbed_lpc1768 msb-430 msb-430h redbee-econotag \
diff --git a/tests/test_bloom_bytes/Makefile b/tests/test_bloom_bytes/Makefile
index 2cbb1fdaf8..dbb4e2ef30 100644
--- a/tests/test_bloom_bytes/Makefile
+++ b/tests/test_bloom_bytes/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_bloom_bytes
+export APPLICATION = test_bloom_bytes
include ../Makefile.tests_common
USEMODULE += hashes
diff --git a/tests/test_disable_module/Makefile b/tests/test_disable_module/Makefile
index 8ec07da854..8d41791c24 100644
--- a/tests/test_disable_module/Makefile
+++ b/tests/test_disable_module/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_disable_module
+export APPLICATION = test_disable_module
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_float/Makefile b/tests/test_float/Makefile
index 8f4b911c20..4168750df0 100644
--- a/tests/test_float/Makefile
+++ b/tests/test_float/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_float
+export APPLICATION = test_float
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_hwtimer/Makefile b/tests/test_hwtimer/Makefile
index e5646a2ebb..9308e25bd0 100644
--- a/tests/test_hwtimer/Makefile
+++ b/tests/test_hwtimer/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_hwtimer
+export APPLICATION = test_hwtimer
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_hwtimer_spin/Makefile b/tests/test_hwtimer_spin/Makefile
index fc10ae4c26..1f5260fe70 100644
--- a/tests/test_hwtimer_spin/Makefile
+++ b/tests/test_hwtimer_spin/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_hwtimer_spin
+export APPLICATION = test_hwtimer_spin
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_hwtimer_wait/Makefile b/tests/test_hwtimer_wait/Makefile
index 35d1ec16fc..11f622c777 100644
--- a/tests/test_hwtimer_wait/Makefile
+++ b/tests/test_hwtimer_wait/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_hwtimer_wait
+export APPLICATION = test_hwtimer_wait
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_irq/Makefile b/tests/test_irq/Makefile
index f808670575..7acb1e919e 100644
--- a/tests/test_irq/Makefile
+++ b/tests/test_irq/Makefile
@@ -1,4 +1,4 @@
-PROJECT = test_irq
+APPLICATION = test_irq
include ../Makefile.tests_common
USEMODULE += auto_init
diff --git a/tests/test_mutex_unlock_and_sleep/Makefile b/tests/test_mutex_unlock_and_sleep/Makefile
index d6293d4c42..31864f2dce 100644
--- a/tests/test_mutex_unlock_and_sleep/Makefile
+++ b/tests/test_mutex_unlock_and_sleep/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_mutex_unlock_and_sleep
+export APPLICATION = test_mutex_unlock_and_sleep
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_nativenet/Makefile b/tests/test_nativenet/Makefile
index bf59055965..c324b67b1b 100644
--- a/tests/test_nativenet/Makefile
+++ b/tests/test_nativenet/Makefile
@@ -1,4 +1,4 @@
-PROJECT = test_nativenet
+APPLICATION = test_nativenet
include ../Makefile.tests_common
BOARD_WHITELIST := native
@@ -12,5 +12,5 @@ FORCE:
touch main.c
sender: CFLAGS += -DSENDER
-sender: PROJECT = test_nativenet_sender
+sender: APPLICATION = test_nativenet_sender
sender: FORCE all
diff --git a/tests/test_net_if/Makefile b/tests/test_net_if/Makefile
index e41b864a39..4b21d78af7 100644
--- a/tests/test_net_if/Makefile
+++ b/tests/test_net_if/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_net_if
+export APPLICATION = test_net_if
BOARD_BLACKLIST = mbed_lpc1768 arduino-due udoo qemu-i386
# qemu-i386: no tranceiver, yet
diff --git a/tests/test_pnet/Makefile b/tests/test_pnet/Makefile
index c8c8ee76a0..1397b0a143 100644
--- a/tests/test_pnet/Makefile
+++ b/tests/test_pnet/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_pnet
+export APPLICATION = test_pnet
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos msb-430h redbee-econotag telosb wsn430-v1_3b wsn430-v1_4 z1
diff --git a/tests/test_posix_semaphore/Makefile b/tests/test_posix_semaphore/Makefile
index b4c1f03f1b..23b3c335c9 100644
--- a/tests/test_posix_semaphore/Makefile
+++ b/tests/test_posix_semaphore/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_posix_semaphore
+export APPLICATION = test_posix_semaphore
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := mbed_lpc1768 redbee-econotag chronos
diff --git a/tests/test_posix_sleep/Makefile b/tests/test_posix_sleep/Makefile
index 4bfdb1dec9..269c5d26a8 100644
--- a/tests/test_posix_sleep/Makefile
+++ b/tests/test_posix_sleep/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_posix_sleep
+export APPLICATION = test_posix_sleep
include ../Makefile.tests_common
USEMODULE += posix
diff --git a/tests/test_pthread/Makefile b/tests/test_pthread/Makefile
index 77cb428b6c..9dadd9cec6 100644
--- a/tests/test_pthread/Makefile
+++ b/tests/test_pthread/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_pthread
+export APPLICATION = test_pthread
include ../Makefile.tests_common
USEMODULE += posix
diff --git a/tests/test_pthread_barrier/Makefile b/tests/test_pthread_barrier/Makefile
index 601253d278..713f529967 100644
--- a/tests/test_pthread_barrier/Makefile
+++ b/tests/test_pthread_barrier/Makefile
@@ -1,5 +1,5 @@
# name of your application
-PROJECT = test_pthread_barrier
+APPLICATION = test_pthread_barrier
include ../Makefile.tests_common
## Modules to include.
diff --git a/tests/test_pthread_cleanup/Makefile b/tests/test_pthread_cleanup/Makefile
index a3a4990ff5..f4bf56031a 100644
--- a/tests/test_pthread_cleanup/Makefile
+++ b/tests/test_pthread_cleanup/Makefile
@@ -1,4 +1,4 @@
-PROJECT = test_pthread_cleanup
+APPLICATION = test_pthread_cleanup
include ../Makefile.tests_common
USEMODULE += pthread
diff --git a/tests/test_pthread_condition_variable/Makefile b/tests/test_pthread_condition_variable/Makefile
index 941edc9950..7f313c669d 100644
--- a/tests/test_pthread_condition_variable/Makefile
+++ b/tests/test_pthread_condition_variable/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_condition_variable
+export APPLICATION = test_condition_variable
include ../Makefile.tests_common
USEMODULE += posix
diff --git a/tests/test_pthread_cooperation/Makefile b/tests/test_pthread_cooperation/Makefile
index a01e5b4ddb..d4e0ebc751 100644
--- a/tests/test_pthread_cooperation/Makefile
+++ b/tests/test_pthread_cooperation/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_pthread_cooperation
+export APPLICATION = test_pthread_cooperation
include ../Makefile.tests_common
USEMODULE += posix
diff --git a/tests/test_pthread_rwlock/Makefile b/tests/test_pthread_rwlock/Makefile
index bdd41fff3b..c3036fb9c9 100644
--- a/tests/test_pthread_rwlock/Makefile
+++ b/tests/test_pthread_rwlock/Makefile
@@ -1,4 +1,4 @@
-PROJECT = test_pthread_rwlock
+APPLICATION = test_pthread_rwlock
include ../Makefile.tests_common
USEMODULE += pthread
diff --git a/tests/test_queue_fairness/Makefile b/tests/test_queue_fairness/Makefile
index c5cff262ac..01dd83bcb8 100644
--- a/tests/test_queue_fairness/Makefile
+++ b/tests/test_queue_fairness/Makefile
@@ -1,4 +1,4 @@
-PROJECT = test_queue_fairness
+APPLICATION = test_queue_fairness
include ../Makefile.tests_common
USEMODULE += vtimer
diff --git a/tests/test_sha256/Makefile b/tests/test_sha256/Makefile
index 79cd3ed124..553afe9e4a 100644
--- a/tests/test_sha256/Makefile
+++ b/tests/test_sha256/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_sha256
+export APPLICATION = test_sha256
include ../Makefile.tests_common
USEMODULE += crypto
diff --git a/tests/test_shell/Makefile b/tests/test_shell/Makefile
index dd7de7b434..0bf1268937 100644
--- a/tests/test_shell/Makefile
+++ b/tests/test_shell/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_shell
+export APPLICATION = test_shell
include ../Makefile.tests_common
USEMODULE += shell
diff --git a/tests/test_thread_basic/Makefile b/tests/test_thread_basic/Makefile
index 8b62fa2109..c0ca44b54b 100644
--- a/tests/test_thread_basic/Makefile
+++ b/tests/test_thread_basic/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_basic
+export APPLICATION = test_thread_basic
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_thread_cooperation/Makefile b/tests/test_thread_cooperation/Makefile
index f7cc70779f..cc333be42d 100644
--- a/tests/test_thread_cooperation/Makefile
+++ b/tests/test_thread_cooperation/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_cooperation
+export APPLICATION = test_thread_cooperation
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos msb-430 msb-430h mbed_lpc1768 redbee-econotag
diff --git a/tests/test_thread_exit/Makefile b/tests/test_thread_exit/Makefile
index 5ab6034643..67ec6f8b86 100644
--- a/tests/test_thread_exit/Makefile
+++ b/tests/test_thread_exit/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_exit
+export APPLICATION = test_thread_exit
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_thread_msg/Makefile b/tests/test_thread_msg/Makefile
index 1ab8f45400..7601227c0f 100644
--- a/tests/test_thread_msg/Makefile
+++ b/tests/test_thread_msg/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_msg
+export APPLICATION = test_thread_msg
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_thread_msg_block_w_queue/Makefile b/tests/test_thread_msg_block_w_queue/Makefile
index dfc976dc48..183fac7cdf 100644
--- a/tests/test_thread_msg_block_w_queue/Makefile
+++ b/tests/test_thread_msg_block_w_queue/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_msg_block_w_queue
+export APPLICATION = test_thread_msg_block_w_queue
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_thread_msg_block_wo_queue/Makefile b/tests/test_thread_msg_block_wo_queue/Makefile
index 6cf5cd8bff..e8464fcd1f 100644
--- a/tests/test_thread_msg_block_wo_queue/Makefile
+++ b/tests/test_thread_msg_block_wo_queue/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_msg_block_wo_queue
+export APPLICATION = test_thread_msg_block_wo_queue
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_thread_msg_seq/Makefile b/tests/test_thread_msg_seq/Makefile
index f4f95bcd33..612ea9dc33 100644
--- a/tests/test_thread_msg_seq/Makefile
+++ b/tests/test_thread_msg_seq/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_thread_msg_seq
+export APPLICATION = test_thread_msg_seq
include ../Makefile.tests_common
DISABLE_MODULE += auto_init
diff --git a/tests/test_vtimer_msg/Makefile b/tests/test_vtimer_msg/Makefile
index ba57fc7b9c..2382465e9b 100644
--- a/tests/test_vtimer_msg/Makefile
+++ b/tests/test_vtimer_msg/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = test_vtimer_msg
+export APPLICATION = test_vtimer_msg
include ../Makefile.tests_common
USEMODULE += vtimer
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 1eac995e0a..b9b70f6afa 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -1,4 +1,4 @@
-export PROJECT = unittests
+export APPLICATION = unittests
include ../Makefile.tests_common
USEMODULE += embunit
--
GitLab