From ac9c80f417127eb95c00c49fa1c682fb7aa604fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Mon, 5 May 2014 21:54:10 +0200 Subject: [PATCH] make: don't use export on example makefiles --- examples/ccn-lite-client/Makefile | 12 ++++++------ examples/ccn-lite-relay/Makefile | 12 ++++++------ examples/default/Makefile | 12 ++++++------ examples/hello-world/Makefile | 8 ++++---- examples/ipc_pingpong/Makefile | 8 ++++---- examples/riot_and_cpp/Makefile | 12 ++++++------ examples/rpl_udp/Makefile | 12 ++++++------ tests/Makefile.tests_common | 6 +++--- 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_mutex_unlock_and_sleep/Makefile | 2 +- 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_condition_variable/Makefile | 2 +- tests/test_pthread_cooperation/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/test_vtimer_msg_diff/Makefile | 2 +- tests/unittests/Makefile | 2 +- 35 files changed, 68 insertions(+), 68 deletions(-) diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile index 7f130a7194..a84dec2adc 100644 --- a/examples/ccn-lite-client/Makefile +++ b/examples/ccn-lite-client/Makefile @@ -1,16 +1,16 @@ # name of your application -export APPLICATION = ccn-lite-client +APPLICATION = ccn-lite-client # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Uncomment these lines if you want to use platform support from external # repositories: -#export RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu -#export RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards +#RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu +#RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards # Uncomment this to enable scheduler statistics for ps: #CFLAGS += -DSCHEDSTATISTICS @@ -25,7 +25,7 @@ export RIOTBASE ?= $(CURDIR)/../.. #CFLAGS += -DDEVELHELP # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 BOARD_INSUFFICIENT_RAM := chronos msb-430h telosb wsn430-v1_3b wsn430-v1_4 BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu redbee-econotag udoo z1 qemu-i386 diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile index 1f02afb00e..28e715f0f0 100644 --- a/examples/ccn-lite-relay/Makefile +++ b/examples/ccn-lite-relay/Makefile @@ -1,16 +1,16 @@ # name of your application -export APPLICATION = ccn-lite-relay +APPLICATION = ccn-lite-relay # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Uncomment these lines if you want to use platform support from external # repositories: -#export RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu -#export RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards +#RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu +#RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards # Uncomment this to enable scheduler statistics for ps: #CFLAGS += -DSCHEDSTATISTICS @@ -25,7 +25,7 @@ export RIOTBASE ?= $(CURDIR)/../.. #CFLAGS += -DDEVELHELP # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 BOARD_INSUFFICIENT_RAM := chronos msb-430h telosb wsn430-v1_3b wsn430-v1_4 BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu redbee-econotag udoo z1 qemu-i386 diff --git a/examples/default/Makefile b/examples/default/Makefile index d7c34e406c..15d4016401 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -1,16 +1,16 @@ # name of your application -export APPLICATION = default +APPLICATION = default # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Uncomment these lines if you want to use platform support from external # repositories: -#export RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu -#export RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards +#RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu +#RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards # Uncomment this to enable scheduler statistics for ps: #CFLAGS += -DSCHEDSTATISTICS @@ -25,7 +25,7 @@ export RIOTBASE ?= $(CURDIR)/../.. #CFLAGS += -DDEVELHELP # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 # Modules to include: diff --git a/examples/hello-world/Makefile b/examples/hello-world/Makefile index 366de1d91b..7a8d210b02 100644 --- a/examples/hello-world/Makefile +++ b/examples/hello-world/Makefile @@ -1,13 +1,13 @@ # name of your application -export APPLICATION = hello-world +APPLICATION = hello-world # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 include $(RIOTBASE)/Makefile.include diff --git a/examples/ipc_pingpong/Makefile b/examples/ipc_pingpong/Makefile index af71faeef6..18e3e3b85f 100644 --- a/examples/ipc_pingpong/Makefile +++ b/examples/ipc_pingpong/Makefile @@ -1,13 +1,13 @@ # name of your application -export APPLICATION = ipc_pingpong +APPLICATION = ipc_pingpong # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 include $(RIOTBASE)/Makefile.include diff --git a/examples/riot_and_cpp/Makefile b/examples/riot_and_cpp/Makefile index d6eb0131b9..fd03eb5cfd 100644 --- a/examples/riot_and_cpp/Makefile +++ b/examples/riot_and_cpp/Makefile @@ -1,16 +1,16 @@ # name of your application -export APPLICATION = riot_and_cpp +APPLICATION = riot_and_cpp # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Uncomment these lines if you want to use platform support from external # repositories: -#export RIOTCPU ?= $(CURDIR)/../../../thirdparty_cpu -#export RIOTBOARD ?= $(CURDIR)/../../../thirdparty_boards +#RIOTCPU ?= $(CURDIR)/../../../thirdparty_cpu +#RIOTBOARD ?= $(CURDIR)/../../../thirdparty_boards # Uncomment this to enable scheduler statistics for ps: #CFLAGS += -DSCHEDSTATISTICS @@ -25,7 +25,7 @@ export RIOTBASE ?= $(CURDIR)/../.. #CFLAGS += -DDEVELHELP # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 # Blacklist boards BOARD_BLACKLIST := arduino-due avsextrem chronos mbed_lpc1768 msb-430h msba2 redbee-econotag telosb wsn430-v1_3b wsn430-v1_4 msb-430 pttu udoo qemu-i386 z1 diff --git a/examples/rpl_udp/Makefile b/examples/rpl_udp/Makefile index 32050d9386..fce630d5e6 100644 --- a/examples/rpl_udp/Makefile +++ b/examples/rpl_udp/Makefile @@ -1,16 +1,16 @@ # name of your application -export APPLICATION = rpl_udp +APPLICATION = rpl_udp # If no BOARD is found in the environment, use this default: -export BOARD ?= native +BOARD ?= native # This has to be the absolute path to the RIOT base directory: -export RIOTBASE ?= $(CURDIR)/../.. +RIOTBASE ?= $(CURDIR)/../.. # Uncomment these lines if you want to use platform support from external # repositories: -#export RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu -#export RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards +#RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu +#RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards # Uncomment this to enable scheduler statistics for ps: #CFLAGS += -DSCHEDSTATISTICS @@ -25,7 +25,7 @@ export RIOTBASE ?= $(CURDIR)/../.. #CFLAGS += -DDEVELHELP # Change this to 0 show compiler invocation lines by default: -export QUIET ?= 1 +QUIET ?= 1 # get rid of the mandatory RPL warning ifeq ($(shell $(CC) -Wno-cpp -E - 2>/dev/null >/dev/null dev/null ; echo $$?),0) diff --git a/tests/Makefile.tests_common b/tests/Makefile.tests_common index 1fb2823490..877ac73810 100644 --- a/tests/Makefile.tests_common +++ b/tests/Makefile.tests_common @@ -1,3 +1,3 @@ -export BOARD ?= native -export RIOTBASE ?= $(CURDIR)/../.. -export QUIET ?= 1 +BOARD ?= native +RIOTBASE ?= $(CURDIR)/../.. +QUIET ?= 1 diff --git a/tests/test_bloom/Makefile b/tests/test_bloom/Makefile index 22b1cdadc8..16c6a14af7 100644 --- a/tests/test_bloom/Makefile +++ b/tests/test_bloom/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_bloom +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 dbb4e2ef30..8f7be25626 100644 --- a/tests/test_bloom_bytes/Makefile +++ b/tests/test_bloom_bytes/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_bloom_bytes +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 8d41791c24..1e3c426030 100644 --- a/tests/test_disable_module/Makefile +++ b/tests/test_disable_module/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_disable_module +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 4168750df0..fc1b3d11c4 100644 --- a/tests/test_float/Makefile +++ b/tests/test_float/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_float +APPLICATION = test_float include ../Makefile.tests_common DISABLE_MODULE += auto_init diff --git a/tests/test_hwtimer/Makefile b/tests/test_hwtimer/Makefile index 9308e25bd0..7685e1f594 100644 --- a/tests/test_hwtimer/Makefile +++ b/tests/test_hwtimer/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_hwtimer +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 1f5260fe70..b76df3430c 100644 --- a/tests/test_hwtimer_spin/Makefile +++ b/tests/test_hwtimer_spin/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_hwtimer_spin +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 11f622c777..e0fc75793b 100644 --- a/tests/test_hwtimer_wait/Makefile +++ b/tests/test_hwtimer_wait/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_hwtimer_wait +APPLICATION = test_hwtimer_wait include ../Makefile.tests_common DISABLE_MODULE += auto_init diff --git a/tests/test_mutex_unlock_and_sleep/Makefile b/tests/test_mutex_unlock_and_sleep/Makefile index 31864f2dce..b3b046ee90 100644 --- a/tests/test_mutex_unlock_and_sleep/Makefile +++ b/tests/test_mutex_unlock_and_sleep/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_mutex_unlock_and_sleep +APPLICATION = test_mutex_unlock_and_sleep include ../Makefile.tests_common DISABLE_MODULE += auto_init diff --git a/tests/test_net_if/Makefile b/tests/test_net_if/Makefile index 4b21d78af7..68c45e441d 100644 --- a/tests/test_net_if/Makefile +++ b/tests/test_net_if/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_net_if +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 1397b0a143..7ac65cca98 100644 --- a/tests/test_pnet/Makefile +++ b/tests/test_pnet/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_pnet +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 a0369c0134..2bfa4a71c0 100644 --- a/tests/test_posix_semaphore/Makefile +++ b/tests/test_posix_semaphore/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_posix_semaphore +APPLICATION = test_posix_semaphore include ../Makefile.tests_common BOARD_INSUFFICIENT_RAM := msb-430 msb-430h mbed_lpc1768 redbee-econotag chronos diff --git a/tests/test_posix_sleep/Makefile b/tests/test_posix_sleep/Makefile index 269c5d26a8..7fd95590ac 100644 --- a/tests/test_posix_sleep/Makefile +++ b/tests/test_posix_sleep/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_posix_sleep +APPLICATION = test_posix_sleep include ../Makefile.tests_common USEMODULE += posix diff --git a/tests/test_pthread/Makefile b/tests/test_pthread/Makefile index 9dadd9cec6..ab7e41554b 100644 --- a/tests/test_pthread/Makefile +++ b/tests/test_pthread/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_pthread +APPLICATION = test_pthread include ../Makefile.tests_common USEMODULE += posix diff --git a/tests/test_pthread_condition_variable/Makefile b/tests/test_pthread_condition_variable/Makefile index 7f313c669d..2c90e9db01 100644 --- a/tests/test_pthread_condition_variable/Makefile +++ b/tests/test_pthread_condition_variable/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_condition_variable +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 d4e0ebc751..396c0b0256 100644 --- a/tests/test_pthread_cooperation/Makefile +++ b/tests/test_pthread_cooperation/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_pthread_cooperation +APPLICATION = test_pthread_cooperation include ../Makefile.tests_common USEMODULE += posix diff --git a/tests/test_sha256/Makefile b/tests/test_sha256/Makefile index 553afe9e4a..e3457f2bd1 100644 --- a/tests/test_sha256/Makefile +++ b/tests/test_sha256/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_sha256 +APPLICATION = test_sha256 include ../Makefile.tests_common USEMODULE += crypto diff --git a/tests/test_shell/Makefile b/tests/test_shell/Makefile index 0bf1268937..94cfdd2ac4 100644 --- a/tests/test_shell/Makefile +++ b/tests/test_shell/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_shell +APPLICATION = test_shell include ../Makefile.tests_common USEMODULE += shell diff --git a/tests/test_thread_basic/Makefile b/tests/test_thread_basic/Makefile index c0ca44b54b..b297276463 100644 --- a/tests/test_thread_basic/Makefile +++ b/tests/test_thread_basic/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_basic +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 cc333be42d..38bc46f0e1 100644 --- a/tests/test_thread_cooperation/Makefile +++ b/tests/test_thread_cooperation/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_cooperation +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 67ec6f8b86..b2e7db1b79 100644 --- a/tests/test_thread_exit/Makefile +++ b/tests/test_thread_exit/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_exit +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 7601227c0f..78d6f01647 100644 --- a/tests/test_thread_msg/Makefile +++ b/tests/test_thread_msg/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_msg +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 183fac7cdf..9dd9e29a61 100644 --- a/tests/test_thread_msg_block_w_queue/Makefile +++ b/tests/test_thread_msg_block_w_queue/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_msg_block_w_queue +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 e8464fcd1f..ecdac17974 100644 --- a/tests/test_thread_msg_block_wo_queue/Makefile +++ b/tests/test_thread_msg_block_wo_queue/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_msg_block_wo_queue +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 612ea9dc33..f462117fea 100644 --- a/tests/test_thread_msg_seq/Makefile +++ b/tests/test_thread_msg_seq/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_thread_msg_seq +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 2382465e9b..57ad278ed2 100644 --- a/tests/test_vtimer_msg/Makefile +++ b/tests/test_vtimer_msg/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_vtimer_msg +APPLICATION = test_vtimer_msg include ../Makefile.tests_common USEMODULE += vtimer diff --git a/tests/test_vtimer_msg_diff/Makefile b/tests/test_vtimer_msg_diff/Makefile index 6685430a38..2631edf7bc 100644 --- a/tests/test_vtimer_msg_diff/Makefile +++ b/tests/test_vtimer_msg_diff/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = test_vtimer_msg_diff +APPLICATION = test_vtimer_msg_diff include ../Makefile.tests_common BOARD_INSUFFICIENT_RAM := mbed_lpc1768 diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile index eb328c3ce5..60e2b84606 100644 --- a/tests/unittests/Makefile +++ b/tests/unittests/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = unittests +APPLICATION = unittests include ../Makefile.tests_common USEMODULE += embunit