Remove LEGATO_WIFI_ROOT envvar and adapt paths.

Since that variable was only defined in makefiles, the api files weren't found when mksys was used to build the sample apps instead of make. Despite MANGOH_WIFI_ROOT existing, it doesn't seem like there's even any need for a path as specific as LEGATO_WIFI_ROOT. Change-Id: Idf0f7774908e6be5102bf198c132f91a1eb5733b Resolves: trac:4628
mangOH · May 13, 2016 · 8e16a6a · 8e16a6a
1 parent 0c8d73f
commit 8e16a6a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,6 @@
 
 message(STATUS "MSG:MangOH  Entered  $ENV{MANGOH_WIFI_ROOT}/CMakeLists.txt")
 message(STATUS "MSG:MangOH:Wifi: CMakeLists.txt called")
-generate_header_extern("$ENV{LEGATO_WIFI_ROOT}/le_wifiClient.api")
-generate_header_extern("$ENV{LEGATO_WIFI_ROOT}/le_wifiAp.api")
+generate_header_extern("$ENV{LEGATO_ROOT}/interfaces/wifi/le_wifiClient.api")
+generate_header_extern("$ENV{LEGATO_ROOT}/interfaces/wifi/le_wifiAp.api")
 message(STATUS "MSG:MangOH  Exit  $ENV{MANGOH_WIFI_ROOT}/CMakeLists.txt")
diff --git a/apps/sample/wifiApTest/Makefile b/apps/sample/wifiApTest/Makefile
@@ -3,11 +3,6 @@ MANGOH_WIFI_ROOT = $(PWD)/../../..
 export MANGOH_WIFI_ROOT
 endif
 
-ifndef LEGATO_WIFI_ROOT
-LEGATO_WIFI_ROOT = $(LEGATO_ROOT)/interfaces/wifi
-export LEGATO_WIFI_ROOT
-endif
-
 localhost: app.localhost
 
 ar7: app.ar7

diff --git a/apps/sample/wifiApTest/wifiApTestComponent/Component.cdef b/apps/sample/wifiApTest/wifiApTestComponent/Component.cdef
@@ -7,6 +7,6 @@ requires:
 {
     api:
     {
-        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiAp.api
     }
 }
diff --git a/apps/sample/wifiClientTest/Makefile b/apps/sample/wifiClientTest/Makefile
@@ -3,11 +3,6 @@ MANGOH_WIFI_ROOT = $(PWD)/../../..
 export MANGOH_WIFI_ROOT
 endif
 
-ifndef LEGATO_WIFI_ROOT
-LEGATO_WIFI_ROOT = $(LEGATO_ROOT)/interfaces/wifi
-export LEGATO_WIFI_ROOT
-endif
-
 localhost: app.localhost
 
 ar7: app.ar7

diff --git a/apps/sample/wifiClientTest/wifiClientTestComponent/Component.cdef b/apps/sample/wifiClientTest/wifiClientTestComponent/Component.cdef
@@ -7,6 +7,6 @@ requires:
 {
     api:
     {
-        ${LEGATO_WIFI_ROOT}/le_wifiClient.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiClient.api
     }
 }
diff --git a/apps/sample/wifiWebAp/Makefile b/apps/sample/wifiWebAp/Makefile
@@ -3,11 +3,6 @@ MANGOH_WIFI_ROOT = $(PWD)/../../..
 export MANGOH_WIFI_ROOT
 endif
 
-ifndef LEGATO_WIFI_ROOT
-LEGATO_WIFI_ROOT = $(LEGATO_ROOT)/interfaces/wifi
-export LEGATO_WIFI_ROOT
-endif
-
 localhost: app.localhost
 
 ar7: app.ar7

diff --git a/apps/sample/wifiWebAp/wifiWebApComponent/Component.cdef b/apps/sample/wifiWebAp/wifiWebApComponent/Component.cdef
@@ -7,7 +7,7 @@ requires:
 {
     api:
     {
-        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiAp.api
     }
 }
 

diff --git a/apps/tools/wifi/wifi/Component.cdef b/apps/tools/wifi/wifi/Component.cdef
@@ -2,8 +2,8 @@ requires:
 {
     api:
     {
-        ${LEGATO_WIFI_ROOT}/le_wifiClient.api
-        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiClient.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiAp.api
     }
 }
 

diff --git a/service/daemon/Component.cdef b/service/daemon/Component.cdef
@@ -2,8 +2,8 @@ provides:
 {
     api:
     {
-        ${LEGATO_WIFI_ROOT}/le_wifiClient.api
-        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiClient.api
+        ${LEGATO_ROOT}/interfaces/wifi/le_wifiAp.api
     }
 }