From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 24 May 2019 09:17:54 +0000 (+0200)
Subject: iw: really fix build
X-Git-Tag: v5.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a458a5c316b4a5700102030a9a9e15c5318ae8;p=thirdparty%2Fiw.git

iw: really fix build

Now after the previous fix, version.o was linked twice...

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/Makefile b/Makefile
index 30749ad..9bcfa8a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,9 @@ CFLAGS += -Wall -Wextra -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-a
 	  -Werror-implicit-function-declaration -Wsign-compare -Wno-unused-parameter \
 	  $(CFLAGS_EVAL)
 
-OBJS = $(sort $(patsubst %.c,%.o,$(wildcard *.c))) version.o
+_OBJS := $(sort $(patsubst %.c,%.o,$(wildcard *.c)))
+VERSION_OBJS := $(filter-out version.o, $(_OBJS))
+OBJS := $(VERSION_OBJS) version.o
 
 ALL = iw
 
@@ -87,8 +89,6 @@ endif
 
 all: $(ALL)
 
-VERSION_OBJS := $(filter-out version.o, $(OBJS))
-
 version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \
 		$(wildcard .git/index .git/refs/tags)
 	@$(NQ) ' GEN ' $@