UPnP: Removed shadowed variable

[wpasupplicant] / hostapd / Makefile

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 7463316..e548430 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -40,9 +40,8 @@ endif
 
 OBJS = hostapd.o ieee802_1x.o eapol_sm.o \
        config.o ieee802_11_auth.o \
-       sta_info.o wpa.o ctrl_iface.o \
+       sta_info.o wpa.o \
        drivers.o preauth.o pmksa_cache.o \
-       hw_features.o \
        drv_callbacks.o \
        tkip_countermeasures.o \
        mlme.o wpa_auth_ie.o
@@ -77,6 +76,12 @@ else
 OBJS += vlan_init.o
 endif
 
+ifdef CONFIG_NO_CTRL_IFACE
+CFLAGS += -DCONFIG_NO_CTRL_IFACE
+else
+OBJS += ctrl_iface.o
+endif
+
 OBJS += ../src/crypto/md5.o
 OBJS += ../src/crypto/rc4.o
 OBJS += ../src/crypto/md4.o
@@ -306,6 +311,16 @@ NEED_DH_GROUPS=y
 NEED_SHA256=y
 NEED_CRYPTO=y
 NEED_BASE64=y
+
+ifdef CONFIG_WPS_UPNP
+CFLAGS += -DCONFIG_WPS_UPNP
+OBJS += ../src/wps/wps_upnp.o
+OBJS += ../src/wps/wps_upnp_ssdp.o
+OBJS += ../src/wps/wps_upnp_web.o
+OBJS += ../src/wps/wps_upnp_event.o
+OBJS += ../src/wps/httpread.o
+endif
+
 endif
 
 ifdef CONFIG_EAP_IKEV2
@@ -320,6 +335,7 @@ CFLAGS += -DEAP_TNC
 OBJS += ../src/eap_server/eap_tnc.o
 OBJS += ../src/eap_server/tncs.o
 NEED_BASE64=y
+LIBS += -ldl
 endif
 
 # Basic EAP functionality is needed for EAPOL
@@ -532,6 +548,7 @@ endif
 
 ifdef NEED_MLME
 OBJS += beacon.o wme.o ap_list.o ieee802_11.o
+OBJS += hw_features.o
 CFLAGS += -DNEED_MLME
 endif