3 files changed, 41 insertions, 5 deletions
diff --git a/extra/hostap/gen.rc b/extra/hostap/gen.rc
index e949c68c..d39b9725 100644
--- a/extra/hostap/gen.rc
+++ b/extra/hostap/gen.rc
@@ -11,11 +11,12 @@ cflags\
 	-D CONFIG_SHA256\
 	-D CONFIG_TDLS\
 	-isystem '$builddir'/core/libressl/include\
-	-isystem extra/libnl/src/include\
+	-isystem '$builddir'/extra/libnl/include\
 	-I '$srcdir'/src/utils\
 	-I '$srcdir'/src
 
-exe bin/wpa_supplicant -d phony/core/libressl/headers\
+deps=phony/^(core/libressl extra/libnl)^/headers
+exe bin/wpa_supplicant -d $"deps\
 	src/common/^(\
 		hw_features_common.c\
 		ieee802_11_common.c\
diff --git a/extra/libnl/internal/defs.h b/extra/libnl/defs.h
index becc29dd..becc29dd 100644
--- a/extra/libnl/internal/defs.h
+++ b/extra/libnl/defs.h
diff --git a/extra/libnl/gen.rc b/extra/libnl/gen.rc
index 39b59638..62e0a465 100644
--- a/extra/libnl/gen.rc
+++ b/extra/libnl/gen.rc
@@ -2,15 +2,50 @@ cflags\
 	-D _GNU_SOURCE\
 	-D 'SYSCONFDIR=''"/etc/libnl"''' \
 	-isystem include\
-	-I '$dir'/internal\
+	-I '$dir' \
+	-I '$outdir'/include\
 	-I '$srcdir'/include\
 	-I '$srcdir'/include/linux-private
 
+hdrs=include/netlink/^(\
+	addr.h\
+	attr.h\
+	cache.h\
+	data.h\
+	errno.h\
+	handlers.h\
+	genl/^(ctrl.h genl.h)\
+	hash.h\
+	list.h\
+	msg.h\
+	netlink.h\
+	netlink-compat.h\
+	netlink-kernel.h\
+	object.h\
+	socket.h\
+	types.h\
+	utils.h\
+)
+for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
+exprs=(\
+	-e s,@PACKAGE_STRING@,'''libnl 3.2.27''',\
+	-e s,@PACKAGE_VERSION@,3.2.27,\
+	-e s,@MAJ_VERSION@,3,\
+	-e s,@MIN_VERSION@,2,\
+	-e s,@MIC_VERSION@,27,\
+	-e s,@LT_CURRENT@,222,\
+	-e s,@LT_REVISION@,0,\
+	-e s,@LT_AGE@,22,\
+) let expr $"exprs --\
+	build '$outdir'/include/netlink/version.h sed '$srcdir'/include/netlink/version.h.in
+hdrs=($hdrs include/netlink/version.h)
+phony headers '$outdir'/$hdrs
 
-lib libnl-3.a lib/^(\
+lib libnl-3.a -d 'phony/$dir/headers' lib/^(\
 	addr.c attr.c cache.c cache_mngr.c cache_mngt.c data.c\
 	error.c handlers.c msg.c nl.c object.c socket.c utils.c\
 	version.c hash.c hashtable.c\
 )
 
-lib libnl-genl-3.a lib/genl/^(ctrl.c family.c genl.c mngt.c)
+lib libnl-genl-3.a -d 'phony/$dir/headers' \
+	lib/genl/^(ctrl.c family.c genl.c mngt.c)