[PATCH v2 08/20] Makefile: add mesh support to wpa_s build

[Bob Copeland]

From: Thomas Pedersen <thomas at noack.us>

Signed-off-by: Javier Lopez <jlopex at gmail.com>
Signed-off-by: Thomas Pedersen <thomas at noack.us>
---
 hostapd/Android.mk        | 4 ++++
 wpa_supplicant/Android.mk | 6 ++++++
 wpa_supplicant/Makefile   | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index edaf6fc..c62d4a7 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -226,6 +226,10 @@ endif
 ifdef CONFIG_WNM
 L_CFLAGS += -DCONFIG_WNM
 OBJS += src/ap/wnm_ap.c
+
+ifdef CONFIG_MESH
+L_CFLAGS += -DCONFIG_MESH
+endif
 endif
 
 ifdef CONFIG_IEEE80211N
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 43c3eed..c883f9f 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -208,6 +208,12 @@ endif
 ifdef CONFIG_WNM
 L_CFLAGS += -DCONFIG_WNM
 OBJS += wnm_sta.c
+ifdef CONFIG_MESH
+NEED_80211_COMMON=y
+L_CFLAGS += -DCONFIG_MESH
+OBJS += mesh.c
+OBJS += mesh_mpm.c
+endif
 endif
 
 ifdef CONFIG_TDLS
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 8f7c23f..fada285 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -199,6 +199,12 @@ NEED_SHA256=y
 NEED_AES_OMAC1=y
 endif
 
+ifdef CONFIG_MESH
+NEED_80211_COMMON=y
+CFLAGS += -DCONFIG_MESH
+OBJS += mesh.o mesh_mpm.o
+endif
+
 ifdef CONFIG_SAE
 CFLAGS += -DCONFIG_SAE
 OBJS += ../src/common/sae.o
-- 
2.1.0.rc1