Modify paths to look for WiFi API files in Legato.

Resolves: trac:4628 Change-Id: I62ed0b439f27f80985339d1e626757d991d3f6ae
mangOH · May 10, 2016 · 0c8d73f · 0c8d73f
1 parent 8d014d8
commit 0c8d73f
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 9 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{MANGOH_WIFI_ROOT}/le_wifiClient.api")
-generate_header_extern("$ENV{MANGOH_WIFI_ROOT}/le_wifiAp.api")
+generate_header_extern("$ENV{LEGATO_WIFI_ROOT}/le_wifiClient.api")
+generate_header_extern("$ENV{LEGATO_WIFI_ROOT}/le_wifiAp.api")
 message(STATUS "MSG:MangOH  Exit  $ENV{MANGOH_WIFI_ROOT}/CMakeLists.txt")
diff --git a/Makefile b/Makefile
@@ -12,6 +12,11 @@ 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
+
 ifndef MANGOH_WIFI_PA
 MANGOH_WIFI_PA = ti
 export MANGOH_WIFI_PA

diff --git a/apps/sample/wifiApTest/Makefile b/apps/sample/wifiApTest/Makefile
@@ -3,6 +3,11 @@ 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:
     {
-        ${MANGOH_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
     }
 }
diff --git a/apps/sample/wifiClientTest/Makefile b/apps/sample/wifiClientTest/Makefile
@@ -3,6 +3,11 @@ 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:
     {
-        ${MANGOH_WIFI_ROOT}/le_wifiClient.api
+        ${LEGATO_WIFI_ROOT}/le_wifiClient.api
     }
 }
diff --git a/apps/sample/wifiWebAp/Makefile b/apps/sample/wifiWebAp/Makefile
@@ -3,6 +3,11 @@ 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:
     {
-        ${MANGOH_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
     }
 }
 

diff --git a/apps/tools/wifi/Makefile b/apps/tools/wifi/Makefile
@@ -3,6 +3,11 @@ 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/tools/wifi/wifi/Component.cdef b/apps/tools/wifi/wifi/Component.cdef
@@ -2,8 +2,8 @@ requires:
 {
     api:
     {
-        ${MANGOH_WIFI_ROOT}/le_wifiClient.api
-        ${MANGOH_WIFI_ROOT}/le_wifiAp.api
+        ${LEGATO_WIFI_ROOT}/le_wifiClient.api
+        ${LEGATO_WIFI_ROOT}/le_wifiAp.api
     }
 }
 

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

diff --git a/targetDefs.wifi b/targetDefs.wifi
@@ -1,6 +1,7 @@
 # Root directory for MangOH code
 export MANGOH_ROOT = $(LEGATO_ROOT)/../mangOH
 export MANGOH_WIFI_ROOT = $(MANGOH_ROOT)/apps/WiFi
+export LEGATO_WIFI_ROOT = $(LEGATO_ROOT)/interfaces/wifi
 
 # this variable goes from environment -> cmake -> Doxygen.
 # It can be used in Legato Doxygen code to conditionally add MangOH links etc.