diff --git a/Makefile.buildtests b/Makefile.buildtests
index 6a705b39009e8c0611f9693dddfda8fc9e29c991..6463decc922ee48cd2db9d1263f9a7ba38b13542 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 98b9430845d4b91952fa4babf4e88a6fd4130f36..ccf83d607d4117cf45e143a487b2137daf8736db 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 9596c37a02737ea19a0a0035ab2cc55d849fe658..987a18f5f4ffda729df50f67c1ecc304c5f9e3e4 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 ab942e931a494eaa9da3ded66c33ac87f8d9c89e..5289a3900012219cb521458e01e2130d74f191a4 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 10c3b2a92ca2e9e3343ce39dea7cb3103af5b799..668c6e8cde4fa6c684eb07ef32d87bf9574640ab 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 303bbfa4dc57bae5d622b77fd43658b3800594f7..fd041ac834e74a331a001408767b3901be6c4bcc 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 e0cad03fd2b053a666f591d1384a81d8dd41a643..6dec003d4d36d8e9ded0cf00b55e59ba0491d5e3 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 d1c9f5bd6e660e608372b23cc0713807c0ffd200..cd76950f1a3276e9c5479978c4b9b8b233f4d888 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 5e3d17ce029a3955a94e7f2e74212de5ed888eb3..85db0b12a200c380268f86c044efeb5fd14c4d0a 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 80ade37401e8c86e1df39ddecbfce17279bb3eec..9e65dea93d0e6ae60ac7337428b96095e94bb8cf 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 8bf7773c6559f43876f3e18fc276b94a7d6a2a42..174ea8f1731c3699f359f4fca24f881acc7c3d9f 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 1cbf8009f935922f93b29287464535f64308a1d2..57805b71890990a912b43249aea471badbd33bbf 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 8a2b96bdecf091980e1ba33068f84cb58c4a97a2..fd182fd80b645c69e41fba211a8c2dca85b19afa 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 be085a42fb360ba35704f962fc45c49ab37fb874..eb4a5023f6dd9d1b162f096be6680eccf3ec00ca 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 29d947056f21d6c9d10c9f696a282c0be0d68f27..92826d6a5b81427bd62e28e04fccdca8eb454679 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 1ff2c2e50070daf1c3c64134db803efd173f7efe..f1070aa8adf8efed205948a3f1e6072de3718e21 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 5ff2a31d3add26211a08e12699042e63ffd7b575..6873493a5002cf0f6e00a769b295c7110f8c9a98 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 cdf4e21353152cdb6e69f3a4463fa3474da442f6..993b40432caa6ec53d97bc329ffa69eaed9c9a05 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 ad728671785a1e9590d493f84de064c522456f53..c249bd46edf54e3ca44e7b7539b0b9a6380ca4f0 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 60a4ea55dbe136b06b3849466fa302ebcbe5bc0d..7f130a7194f9c87fe7c1552ec303561562e2f4ca 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 9dc91a7d4df2ca7aa11daaa01b1e69f18e6a4c39..1f02afb00e3da4ca242933df871e19df0355e9ca 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 b1b135e65c7b3715f7708cf7990c95f8e851a741..d7c34e406cc5c28012dcc4d2e297193c13be0415 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 d7062d96c6c49e1ef05e23fb1c843f10b50c389b..366de1d91be7c0eed523421acf4b8a4d75beea32 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 85d482d9312854a183b6c2aea4a3b4a7c7880de1..af71faeef63ea2d168ccebd2ac1a02a80fc071c2 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 8c7e79f4f20bcb36273f8a46b510ff9efaf20a64..32050d938634aea06748ea7a0b5b815326d6b5cf 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
Binary files a/pkg/oonf_api/0002-port-tests-to-riot.patch and b/pkg/oonf_api/0002-port-tests-to-riot.patch differ
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
Binary files a/pkg/oonf_api/0003-port-example-to-riot.patch and b/pkg/oonf_api/0003-port-example-to-riot.patch differ
diff --git a/tests/test_bloom/Makefile b/tests/test_bloom/Makefile
index c119c007e87fdfdad8a493d3e171b9a37ddcc876..1dd789157cb90c15d6279c8591d2ded078d520f7 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 2cbb1fdaf83d8fad7a8ca18e3b751adfa8aab4e4..dbb4e2ef30aa80daa0bbc07d9e369ec10d892e1f 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 8ec07da85424a5941d69be2958010a083ad2db9c..8d41791c242f896bafa5961672746543d74bdae0 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 8f4b911c2093da02a4afdb553b1ad02dc168da86..4168750df0448ca799e142f28e8979a4f8bbc66a 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 e5646a2ebbeadf26f8e50c190ac879d7b19f7d06..9308e25bd0cb5175b5694f11d4e935a00af3f9d9 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 fc10ae4c2672515cb538d5c90d61cd56de723d9f..1f5260fe70ae93c34ded64ad6338864928e11532 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 35d1ec16fceca48231cd58f0b8784f9cf9186db1..11f622c77741972303aa9876e87148472b1d3a02 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 f808670575bb14834f4c7d31b9b7a9c9075c3288..7acb1e919e5a22a7f417eababd12932524200bea 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 d6293d4c42f292f883b611621dceefe62590a845..31864f2dce518d7d366604e38a1cc6fae378f9b0 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 bf59055965d70e0472abe23a54fc59aff6eeb3b0..c324b67b1be17f3c8297edc81969fb72a6fcc93f 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 e41b864a39a9d16566311b3f738de043367ae99c..4b21d78af7018fb27685a8ee3ded88041252f558 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 c8c8ee76a0dff8f0cd81b68a4c3d51a13fe16a1b..1397b0a143cd11bf32a35063a388cbe81d939a62 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 b4c1f03f1b8e0c7b1018e266d689a34455765084..23b3c335c99eb4cbaba039eb652e0ea77b6c1b93 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 4bfdb1dec9e112d7ba895f31280bef147b52313f..269c5d26a89356b8e83caa0b843205f9c30c10d0 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 77cb428b6caaa6d9ebc8b872cf137aa99dd1d6ab..9dadd9cec633f1f1b7553c2e2b78944775917cf5 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 601253d278e61e65472706b6d1a65c8c08dc4c81..713f5299676d4315c8b5c607a68e1bae8d83d757 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 a3a4990ff50f979149de97e095aa8fae69d353b6..f4bf56031ae52aed4eab43cc6a1f98a93c12b1e1 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 941edc9950c9763246b97e776f376b4e8d4fda2b..7f313c669d5c5335f33c4f531221979a5c0bf514 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 a01e5b4ddb0fef51a4b506dc0504ec3b4271f80e..d4e0ebc751c96a942d84a425787b331b7abe9912 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 bdd41fff3b6f77490c54dc276dd6eb5958fe8234..c3036fb9c960c230ebc7101cee0cf02ebfe44ce7 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 c5cff262aca04409509023109602ae67cb8037f7..01dd83bcb8416feaa54fb4472b264d0bb726a0c3 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 79cd3ed1241d7eb3750d17ba691de9521a43fa23..553afe9e4a344ceedcacd58b1b314676e26ff739 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 dd7de7b434d83651d22b4db35dec32e01c4e1f2f..0bf1268937064d162e81b9daecd486a544c2da5a 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 8b62fa2109a41bcdb77e7a618454307ad826108c..c0ca44b54be08d07b855ecff3c14bae16490f157 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 f7cc70779f42e0888d019594bbc1c12951da8d30..cc333be42d8bb5340b177c37c4db879c2fab0dbd 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 5ab60346430d6a010ce42f2677f24e06660929b3..67ec6f8b86510dd6b0567d242ae221c7292abee5 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 1ab8f454007e144286b2b68f93b910539124e84f..7601227c0f4c3ea8dc7ea047ec1af089372e8b87 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 dfc976dc485fbd74452fc98abf389ddb989a9538..183fac7cdf42a634f7cb57bd7d81b0d3c7e997f9 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 6cf5cd8bffd59539ac6f5c38e2c704d939640e4c..e8464fcd1fe2191c601dbc2b15cd8ccbd17301bd 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 f4f95bcd339e511b75e632ef20268bc51a9cdcd4..612ea9dc3362e9b933d5a37914cb41be00aafef4 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 ba57fc7b9c8f6daf5ce7bba2d642f989c6915b78..2382465e9b09b1953348c977b82f450ddb8ca439 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 1eac995e0a4ae9e119d8dde93717880ab8a80bbb..b9b70f6afa9a3388c1f258a8b08336ac0522f953 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