aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd/Makefile
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2011-07-16 14:37:18 (GMT)
committerJouni Malinen <j@w1.fi>2011-07-16 14:37:18 (GMT)
commit428380597240290085a99adb3c9cea5489e62976 (patch)
treedbb9cd736af4884db9cc019f93a2d8aeb0148d97 /hostapd/Makefile
parent7b7ce8aa139ff712562e3e4bad308deb241fba15 (diff)
downloadhostap-428380597240290085a99adb3c9cea5489e62976.zip
hostap-428380597240290085a99adb3c9cea5489e62976.tar.gz
hostap-428380597240290085a99adb3c9cea5489e62976.tar.bz2
hostapd_cli: Start using src/utils/edit*.c
This brings hostapd_cli closer to the design used in wpa_cli and allows command history and editing mechanisms to be added.
Diffstat (limited to 'hostapd/Makefile')
-rw-r--r--hostapd/Makefile15
1 files changed, 13 insertions, 2 deletions
diff --git a/hostapd/Makefile b/hostapd/Makefile
index d05975b..3ed025d 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -52,6 +52,8 @@ OBJS += ../src/ap/wpa_auth_ie.o
OBJS += ../src/ap/preauth_auth.o
OBJS += ../src/ap/pmksa_cache_auth.o
+OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+
NEED_RC4=y
NEED_AES=y
NEED_MD5=y
@@ -74,7 +76,11 @@ LIBS_h += -lbfd
endif
endif
-OBJS += ../src/utils/eloop.o
+ifndef CONFIG_ELOOP
+CONFIG_ELOOP=eloop
+endif
+OBJS += ../src/utils/$(CONFIG_ELOOP).o
+OBJS_c += ../src/utils/$(CONFIG_ELOOP).o
OBJS += ../src/utils/common.o
OBJS += ../src/utils/wpa_debug.o
OBJS += ../src/utils/wpabuf.o
@@ -736,6 +742,12 @@ CFLAGS += -DCONFIG_P2P_MANAGER
OBJS += ../src/ap/p2p_hostapd.o
endif
+ifdef CONFIG_WPA_CLI_EDIT
+OBJS_c += ../src/utils/edit.o
+else
+OBJS_c += ../src/utils/edit_simple.o
+endif
+
ifdef CONFIG_NO_STDOUT_DEBUG
CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
endif
@@ -784,7 +796,6 @@ hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
-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