fix compilation errors

Context of unselected examples are executed for builtin.
It make compilation errors. This patch makes only context of
selected example executed.

diff --git a/apps/examples/artik_demo/Makefile b/apps/examples/artik_demo/Makefile
index 0f5c918..ca5d5f3 100644 (file)
--- a/apps/examples/artik_demo/Makefile
+++ b/apps/examples/artik_demo/Makefile
@@ -125,7 +125,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_ARTIK_DEMO),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/dnsclient_test/Makefile b/apps/examples/dnsclient_test/Makefile
index d49b93d..d84ec13 100644 (file)
--- a/apps/examples/dnsclient_test/Makefile
+++ b/apps/examples/dnsclient_test/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_DNSCLIENT_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/dtls_client/Makefile b/apps/examples/dtls_client/Makefile
index 6f2c3ca..e04a778 100644 (file)
--- a/apps/examples/dtls_client/Makefile
+++ b/apps/examples/dtls_client/Makefile
@@ -125,7 +125,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_DTLS_CLIENT),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/dtls_server/Makefile b/apps/examples/dtls_server/Makefile
index 89b0d72..c9243e4 100644 (file)
--- a/apps/examples/dtls_server/Makefile
+++ b/apps/examples/dtls_server/Makefile
@@ -125,7 +125,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_DTLS_SERVER),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/easysetup/Makefile b/apps/examples/easysetup/Makefile
index 603a2e1..b719dd6 100644 (file)
--- a/apps/examples/easysetup/Makefile
+++ b/apps/examples/easysetup/Makefile
@@ -111,7 +111,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_EASYSETUP),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/fota_sample/Makefile b/apps/examples/fota_sample/Makefile
index e7e607e..c823416 100644 (file)
--- a/apps/examples/fota_sample/Makefile
+++ b/apps/examples/fota_sample/Makefile
@@ -130,7 +130,7 @@ endif
 
 # Register application
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_FOTA_SAMPLE),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(FUNCNAME),$(THREADEXEC))
 

diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index 1878ee9..3145e2c 100644 (file)
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_HELLO),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/iperf/Makefile b/apps/examples/iperf/Makefile
index 80f4287..18c9542 100644 (file)
--- a/apps/examples/iperf/Makefile
+++ b/apps/examples/iperf/Makefile
@@ -94,7 +94,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_IPERF),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/kernel_sample/Makefile b/apps/examples/kernel_sample/Makefile
index e57c572..3baeb50 100644 (file)
--- a/apps/examples/kernel_sample/Makefile
+++ b/apps/examples/kernel_sample/Makefile
@@ -179,7 +179,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_KERNEL_SAMPLE),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/mdns_test/Makefile b/apps/examples/mdns_test/Makefile
index 8469f1b..f0037d5 100644 (file)
--- a/apps/examples/mdns_test/Makefile
+++ b/apps/examples/mdns_test/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_MDNS_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/mqtt_test/Makefile b/apps/examples/mqtt_test/Makefile
index 1549096..99150c3 100644 (file)
--- a/apps/examples/mqtt_test/Makefile
+++ b/apps/examples/mqtt_test/Makefile
@@ -119,7 +119,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_MQTT_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(SUBAPPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(SUBAPPNAME),$(SUBFUNCNAME),$(THREADEXEC))
 

diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile
index cc698e1..c422a45 100644 (file)
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@@ -129,7 +129,7 @@ endif
 
 # Register application
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_NETTEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/ntpclient_test/Makefile b/apps/examples/ntpclient_test/Makefile
index 2250a11..81de6a4 100644 (file)
--- a/apps/examples/ntpclient_test/Makefile
+++ b/apps/examples/ntpclient_test/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_NTPCLIENT_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/proc_test/Makefile b/apps/examples/proc_test/Makefile
index d365286..44dfa26 100644 (file)
--- a/apps/examples/proc_test/Makefile
+++ b/apps/examples/proc_test/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_PROC_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/select_test/Makefile b/apps/examples/select_test/Makefile
index 49f38a2..a14c456 100644 (file)
--- a/apps/examples/select_test/Makefile
+++ b/apps/examples/select_test/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_SELECT_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/sensorbd_demo/Makefile b/apps/examples/sensorbd_demo/Makefile
index 86528e1..b1cb550 100644 (file)
--- a/apps/examples/sensorbd_demo/Makefile
+++ b/apps/examples/sensorbd_demo/Makefile
@@ -128,7 +128,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_SENSORBOARD),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/slsiwifi/Makefile b/apps/examples/slsiwifi/Makefile
index a43027e..ea4b7b9 100644 (file)
--- a/apps/examples/slsiwifi/Makefile
+++ b/apps/examples/slsiwifi/Makefile
@@ -139,7 +139,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_SLSIWIFI),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(FUNCNAME),$(THREADEXEC))
 

diff --git a/apps/examples/smart/Makefile b/apps/examples/smart/Makefile
index 3c51ffc..936c874 100644 (file)
--- a/apps/examples/smart/Makefile
+++ b/apps/examples/smart/Makefile
@@ -126,7 +126,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_SMART),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/sysio_test/Makefile b/apps/examples/sysio_test/Makefile
index ce6beb3..6211a1a 100644 (file)
--- a/apps/examples/sysio_test/Makefile
+++ b/apps/examples/sysio_test/Makefile
@@ -129,7 +129,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_SYSIO_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile
index f3342c8..07bd9ec 100644 (file)
--- a/apps/examples/telnetd/Makefile
+++ b/apps/examples/telnetd/Makefile
@@ -129,7 +129,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_TELNETD),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/testcase/Makefile b/apps/examples/testcase/Makefile
index 4071d8f..113a4ba 100644 (file)
--- a/apps/examples/testcase/Makefile
+++ b/apps/examples/testcase/Makefile
@@ -125,7 +125,7 @@ endif
 
 install:
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_TESTCASE),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/tls_client/Makefile b/apps/examples/tls_client/Makefile
index ebd06de..2b9dc42 100644 (file)
--- a/apps/examples/tls_client/Makefile
+++ b/apps/examples/tls_client/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_TLS_CLIENT),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/tls_selftest/Makefile b/apps/examples/tls_selftest/Makefile
index fef9227..688ff71 100644 (file)
--- a/apps/examples/tls_selftest/Makefile
+++ b/apps/examples/tls_selftest/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_TLS_SELFTEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/tls_server/Makefile b/apps/examples/tls_server/Makefile
index 27d84aa..9d09e3f 100644 (file)
--- a/apps/examples/tls_server/Makefile
+++ b/apps/examples/tls_server/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_TLS_SERVER),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/wakaama_client/Makefile b/apps/examples/wakaama_client/Makefile
index 3b9b948..632167b 100644 (file)
--- a/apps/examples/wakaama_client/Makefile
+++ b/apps/examples/wakaama_client/Makefile
@@ -134,7 +134,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_WAKAAMA_CLIENT),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/webclient/Makefile b/apps/examples/webclient/Makefile
index e9c524e..82e5d22 100644 (file)
--- a/apps/examples/webclient/Makefile
+++ b/apps/examples/webclient/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_WEBCLIENT),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/webserver/Makefile b/apps/examples/webserver/Makefile
index d3610ee..827cc1d 100644 (file)
--- a/apps/examples/webserver/Makefile
+++ b/apps/examples/webserver/Makefile
@@ -130,7 +130,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_WEBSERVER),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/websocket/Makefile b/apps/examples/websocket/Makefile
index 0c6a091..31e2e9c 100644 (file)
--- a/apps/examples/websocket/Makefile
+++ b/apps/examples/websocket/Makefile
@@ -128,7 +128,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_WEBSOCKET),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/wifi_test/Makefile b/apps/examples/wifi_test/Makefile
index 6458180..6a93c33 100644 (file)
--- a/apps/examples/wifi_test/Makefile
+++ b/apps/examples/wifi_test/Makefile
@@ -92,7 +92,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_WIFI_TEST),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))
 

diff --git a/apps/examples/workqueue/Makefile b/apps/examples/workqueue/Makefile
index 934beb5..09fb795 100644 (file)
--- a/apps/examples/workqueue/Makefile
+++ b/apps/examples/workqueue/Makefile
@@ -127,7 +127,7 @@ install:
 
 endif
 
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifeq ($(CONFIG_BUILTIN_APPS)$(CONFIG_EXAMPLES_WORKQUEUE),yy)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
        $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC))