diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-04-30 18:11:01 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-30 18:11:01 +0000 |
commit | f06689ce617261ceed32e279a5ce22d33e4c2b68 (patch) | |
tree | 68a1ae2084c197d71ec362d499cb5e2ee802a193 /package/hostapd/Makefile | |
parent | 2e56467889aad37af32d27f4964e72bd947f5c54 (diff) | |
download | upstream-f06689ce617261ceed32e279a5ce22d33e4c2b68.tar.gz upstream-f06689ce617261ceed32e279a5ce22d33e4c2b68.tar.bz2 upstream-f06689ce617261ceed32e279a5ce22d33e4c2b68.zip |
hostapd: use libnl-tiny instead of libnl
SVN-Revision: 15519
Diffstat (limited to 'package/hostapd/Makefile')
-rw-r--r-- | package/hostapd/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 0c1d6fc776..bd873b9b2f 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -20,7 +20,6 @@ PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c PKG_BUILD_DEPENDS:= \ PACKAGE_kmod-madwifi:madwifi \ PACKAGE_kmod-mac80211:mac80211 \ - PACKAGE_kmod-mac80211:libnl \ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-ath9k \ @@ -41,7 +40,7 @@ define Package/hostapd/Default CATEGORY:=Network TITLE:=IEEE 802.1x Authenticator URL:=http://hostap.epitest.fi/ - DEPENDS:=@!TARGET_avr32 @!TARGET_etrax + DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny endef define Package/hostapd @@ -94,13 +93,20 @@ define Build/ConfigureTarget $(CP) ./files/$(1).config $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/.config endef +TARGET_CPPFLAGS := \ + -I$(STAGING_DIR)/usr/include/libnl-tiny \ + $(TARGET_CPPFLAGS) \ + -I$(STAGING_DIR)/usr/include/madwifi \ + -I$(STAGING_DIR)/usr/include/mac80211 \ + -DCONFIG_LIBNL20 + define Build/CompileTarget - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \ + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \ $(TARGET_CONFIGURE_OPTS) \ $(DRIVER_MAKEOPTS) \ LIBS="$(TARGET_LDFLAGS) \ - $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \ + $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm -lnl-tiny) \ $(if $(findstring default,$(1)),-lssl -lcrypto)" \ hostapd hostapd_cli $(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/hostapd_cli $(PKG_BUILD_DIR)/ |