ibss: use correct "MHz" instead of "MHZ"

[thirdparty/iw.git] / Makefile

diff --git a/Makefile b/Makefile
index 9cf8a8e92392c79a2a898c90c9dee0df636f14bc..548591a30a9fe8ff00a5eb7b756c02f7d83a1e99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
--include .config
-
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
@@ -15,16 +13,19 @@ CFLAGS ?= -O2 -g
 CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
 
 OBJS = iw.o genl.o event.o info.o phy.o \
-       interface.o ibss.o station.o survey.o util.o \
-       mesh.o mpath.o scan.o reg.o version.o \
+       interface.o ibss.o station.o survey.o util.o ocb.o \
+       mesh.o mpath.o mpp.o scan.o reg.o version.o \
        reason.o status.o connect.o link.o offch.o ps.o cqm.o \
-       bitrate.o wowlan.o roc.o
+       bitrate.o wowlan.o coalesce.o roc.o p2p.o vendor.o
 OBJS += sections.o
 
 OBJS-$(HWSIM) += hwsim.o
 
+OBJS += $(OBJS-y) $(OBJS-Y)
+
 ALL = iw
 
+ifeq ($(NO_PKG_CONFIG),)
 NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
 ifneq ($(NL3xFOUND),Y)
 NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
@@ -77,6 +78,7 @@ endif
 
 LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
 CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
+endif # NO_PKG_CONFIG
 
 ifeq ($(V),1)
 Q=
@@ -88,7 +90,7 @@ endif
 
 all: $(ALL)
 
-VERSION_OBJS := $(filter-out version.o, $(OBJS) $(OBJS-y))
+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)
@@ -99,9 +101,11 @@ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefil
        @$(NQ) ' CC  ' $@
        $(Q)$(CC) $(CFLAGS) -c -o $@ $<
 
-iw:    $(OBJS) $(OBJS-y)
+ifeq ($(IW_ANDROID_BUILD),)
+iw:    $(OBJS)
        @$(NQ) ' CC  ' iw
-       $(Q)$(CC) $(LDFLAGS) $(OBJS) $(OBJS-y) $(LIBS) -o iw
+       $(Q)$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o iw
+endif
 
 check:
        $(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"