diff options
Diffstat (limited to 'wpa_supplicant/Makefile')
| -rw-r--r-- | wpa_supplicant/Makefile | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 0832f10..03241c5 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -15,12 +15,13 @@ CFLAGS += -I../src/utils -include .config -ALL=wpa_supplicant wpa_cli +BINALL=wpa_supplicant wpa_cli ifndef CONFIG_NO_WPA_PASSPHRASE -ALL += wpa_passphrase +BINALL += wpa_passphrase endif +ALL = $(BINALL) ALL += systemd/wpa_supplicant.service ALL += systemd/wpa_supplicant@.service ALL += systemd/wpa_supplicant-nl80211@.service @@ -48,9 +49,10 @@ mkconfig: echo CONFIG_DRIVER_HOSTAP=y >> .config echo CONFIG_DRIVER_WEXT=y >> .config -install: all - mkdir -p $(DESTDIR)$(BINDIR) - for i in $(ALL); do cp $$i $(DESTDIR)$(BINDIR)/$$i; done +$(DESTDIR)$(BINDIR)/%: % + install -D $(<) $(@) + +install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL)) $(MAKE) -C ../src install OBJS = config.o @@ -106,11 +108,19 @@ endif OBJS += ../src/utils/$(CONFIG_ELOOP).o OBJS_c += ../src/utils/$(CONFIG_ELOOP).o +ifdef CONFIG_ELOOP_POLL +CFLAGS += -DCONFIG_ELOOP_POLL +endif + ifdef CONFIG_EAPOL_TEST CFLAGS += -Werror -DEAPOL_TEST endif +ifdef CONFIG_HT_OVERRIDES +CFLAGS += -DCONFIG_HT_OVERRIDES +endif + ifndef CONFIG_BACKEND CONFIG_BACKEND=file endif @@ -1161,17 +1171,6 @@ endif ifndef DBUS_INCLUDE DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1) endif -dbus_version=$(subst ., ,$(shell $(PKG_CONFIG) --modversion dbus-1)) -DBUS_VERSION_MAJOR=$(word 1,$(dbus_version)) -DBUS_VERSION_MINOR=$(word 2,$(dbus_version)) -ifeq ($(DBUS_VERSION_MAJOR),) -DBUS_VERSION_MAJOR=0 -endif -ifeq ($(DBUS_VERSION_MINOR),) -DBUS_VERSION_MINOR=0 -endif -DBUS_INCLUDE += -DDBUS_VERSION_MAJOR=$(DBUS_VERSION_MAJOR) -DBUS_INCLUDE += -DDBUS_VERSION_MINOR=$(DBUS_VERSION_MINOR) DBUS_CFLAGS += $(DBUS_INCLUDE) endif @@ -1476,6 +1475,9 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.c ../src/eap_peer/ikev2.c ../src/eap_com %.service: %.service.in sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ +%@.service: %.service.arg.in + sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ + wpa_supplicant.exe: wpa_supplicant mv -f $< $@ wpa_cli.exe: wpa_cli |