Move hostapd-to-driver flag mapping to be within ap_drv_ops.c

[libeap.git] / hostapd / Makefile

diff --git a/hostapd/Makefile b/hostapd/Makefile
index a607be2..f3e4275 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -33,12 +33,13 @@ LIBS += -lws2_32
 endif
 
 OBJS = hostapd.o main.o ieee802_1x.o \
-       config.o ieee802_11_auth.o \
+       config.o config_file.o ieee802_11_auth.o \
        sta_info.o wpa.o \
        preauth.o pmksa_cache.o \
        drv_callbacks.o \
        tkip_countermeasures.o \
        mlme.o wpa_auth_ie.o
+OBJS += ap_drv_ops.o
 NEED_RC4=y
 NEED_AES=y
 NEED_MD5=y
@@ -48,6 +49,18 @@ OBJS += ../src/drivers/drivers.o
 OBJS += ../src/drivers/scan_helpers.o
 CFLAGS += -DHOSTAPD
 
+ifdef CONFIG_WPA_TRACE
+CFLAGS += -DWPA_TRACE
+OBJS += ../src/utils/trace.o
+LDFLAGS += -rdynamic
+CFLAGS += -funwind-tables
+ifdef CONFIG_WPA_TRACE_BFD
+CFLAGS += -DWPA_TRACE_BFD
+LIBS += -lbfd
+LIBS_c += -lbfd
+endif
+endif
+
 OBJS += ../src/utils/eloop.o
 OBJS += ../src/utils/common.o
 OBJS += ../src/utils/wpa_debug.o
@@ -314,6 +327,7 @@ 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/wps_upnp_ap.o
 OBJS += ../src/wps/upnp_xml.o
 OBJS += ../src/wps/httpread.o
 OBJS += ../src/wps/http_client.o
@@ -627,19 +641,16 @@ OBJS += ../src/crypto/sha256-internal.o
 endif
 endif
 
-ifdef CONFIG_INTERNAL_DH_GROUP5
 ifdef NEED_DH_GROUPS
 OBJS += ../src/crypto/dh_groups.o
-OBJS += ../src/crypto/dh_group5.o
-ifdef NEED_DH_GROUPS_ALL
-CFLAGS += -DALL_DH_GROUPS
 endif
-endif
-else
 ifdef NEED_DH_GROUPS_ALL
-OBJS += ../src/crypto/dh_groups.o
 CFLAGS += -DALL_DH_GROUPS
 endif
+ifdef CONFIG_INTERNAL_DH_GROUP5
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_group5.o
+endif
 endif
 
 ifdef CONFIG_RADIUS_SERVER
@@ -668,6 +679,9 @@ endif
 ifdef NEED_AP_MLME
 OBJS += beacon.o wme.o ap_list.o ieee802_11.o
 OBJS += hw_features.o
+ifdef CONFIG_IEEE80211N
+OBJS += ieee802_11_ht.o
+endif
 CFLAGS += -DNEED_AP_MLME
 endif
 
@@ -714,8 +728,12 @@ hostapd: $(BCHECK) $(OBJS)
        $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
 
 OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ifdef CONFIG_WPA_TRACE
+OBJS_c += ../src/utils/trace.o
+OBJS_c += ../src/utils/wpa_debug.o
+endif
 hostapd_cli: $(OBJS_c)
-       $(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c)
+       $(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
 
 NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS) ../src/crypto/rc4.o ../src/crypto/md5.o
 ifdef CONFIG_INTERNAL_MD5