development / attic / ports / opt-cross.git / blame
| Commit | Line | Data |
|---|---|---|
| c8be49dd JB |
1 | diff -purN iw-0.9.20.orig/Makefile iw-0.9.20/Makefile |
| 2 | --- iw-0.9.20.orig/Makefile 2010-12-02 08:13:30.000000000 +0000 | |
| 3 | +++ iw-0.9.20/Makefile 2010-12-02 08:17:58.000000000 +0000 | |
| 4 | @@ -19,27 +19,11 @@ OBJS = iw.o genl.o event.o info.o phy.o | |
| 5 | mesh.o mpath.o scan.o reg.o version.o \ | |
| 6 | reason.o status.o connect.o link.o offch.o ps.o cqm.o | |
| 7 | OBJS += sections.o | |
| 8 | -ALL = iw | |
| 9 | ||
| 10 | -NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y) | |
| 11 | -NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y) | |
| 12 | - | |
| 13 | -ifeq ($(NL1FOUND),Y) | |
| 14 | NLLIBNAME = libnl-1 | |
| 15 | -endif | |
| 16 | - | |
| 17 | -ifeq ($(NL2FOUND),Y) | |
| 18 | -CFLAGS += -DCONFIG_LIBNL20 | |
| 19 | -LIBS += -lnl-genl | |
| 20 | -NLLIBNAME = libnl-2.0 | |
| 21 | -endif | |
| 22 | - | |
| 23 | -ifeq ($(NLLIBNAME),) | |
| 24 | -$(error Cannot find development files for any supported version of libnl) | |
| 25 | -endif | |
| 26 | ||
| 27 | -LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME)) | |
| 28 | -CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME)) | |
| 29 | +LIBS += -lnl | |
| 30 | +CFLAGS += | |
| 31 | ||
| 32 | ifeq ($(V),1) | |
| 33 | Q= | |
| 34 | @@ -49,17 +33,7 @@ Q=@ | |
| 35 | NQ=echo | |
| 36 | endif | |
| 37 | ||
| 38 | -all: version_check $(ALL) | |
| 39 | - | |
| 40 | -version_check: | |
| 41 | -ifeq ($(NL2FOUND),Y) | |
| 42 | -else | |
| 43 | -ifeq ($(NL1FOUND),Y) | |
| 44 | -else | |
| 45 | - $(error No libnl found) | |
| 46 | -endif | |
| 47 | -endif | |
| 48 | - | |
| 49 | +all: iw | |
| 50 | ||
| 51 | VERSION_OBJS := $(filter-out version.o, $(OBJS)) | |
| 52 |