wireless-tools: update Makefile

tsl0922 · Jul 14, 2023 · 74d2f39 · 74d2f39
1 parent 79297fb
commit 74d2f39
Show file tree

Hide file tree

Showing 83 changed files with 22 additions and 16 deletions.
diff --git a/trunk/user/Makefile b/trunk/user/Makefile
@@ -101,7 +101,7 @@ dir_$(CONFIG_FIRMWARE_INCLUDE_IPSET)		+= ipset
 endif
 dir_y						+= ebtables
 dir_y						+= iproute2
-dir_y						+= wireless_tools
+dir_y						+= wireless-tools
 dir_y						+= shared
 dir_$(STORAGE_ENABLED)				+= libdisk
 dir_y						+= nvram

diff --git a/trunk/user/httpd/Makefile b/trunk/user/httpd/Makefile
@@ -9,11 +9,10 @@ include $(SHDIR)/boards.mk
 include $(SHDIR)/cflags.mk
 
 CFLAGS += -Wall -I. -I$(SHDIR) -I$(SHDIR)/include
-CFLAGS += -I$(USERDIR)/wireless_tools
 
 LDFLAGS += -L. -lm
 LDFLAGS += -L$(SHDIR) -lshared
-LDFLAGS += -L$(USERDIR)/wireless_tools -liw
+LDFLAGS += -liw
 ifeq ($(STORAGE_ENABLED),y)
 CFLAGS  += -I$(USERDIR)/libdisk
 LDFLAGS += -L$(USERDIR)/libdisk -ldisk

diff --git a/trunk/user/rc/Makefile b/trunk/user/rc/Makefile
@@ -10,14 +10,13 @@ include $(SHDIR)/boards.mk
 include $(SHDIR)/cflags.mk
 
 CFLAGS += -s -I. -I$(SHDIR) -I$(SHDIR)/include
-CFLAGS += -I$(USERDIR)/wireless_tools
 CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/include/ralink
 
 # Disable/Enable ugly httpd_check
 #CFLAGS += -DHTTPD_CHECK
 
 LDFLAGS += -L. -lm
-LDFLAGS += -L$(USERDIR)/wireless_tools -liw
+LDFLAGS += -liw
 LDFLAGS += -L$(SHDIR) -lshared
 ifeq ($(STORAGE_ENABLED),y)
 CFLAGS += -I$(USERDIR)/libdisk

diff --git a/trunk/user/wireless-tools/Makefile b/trunk/user/wireless-tools/Makefile
@@ -0,0 +1,19 @@
+include $(ROOTDIR)/rules.mk
+
+PKG_NAME:=wireless-tools
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_INSTALL_FLAGS += PREFIX=$(STAGING_DIR)
+
+$(eval $(call BuildPackage,wireless-tools))
+
+romfs:
+	$(INSTALL_DIR) $(ROMFSDIR)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwpriv $(ROMFSDIR)/bin/iwpriv
+ifndef BUILD_STATIC
+	$(INSTALL_DIR) $(ROMFSDIR)/lib
+	$(CP) $(PKG_BUILD_DIR)/libiw.so* $(ROMFSDIR)/lib/
+endif
diff --git a/...ser/wireless_tools/19-udev-ifrename.rules → ...wireless-tools/src/19-udev-ifrename.rules b/...ser/wireless_tools/19-udev-ifrename.rules → ...wireless-tools/src/19-udev-ifrename.rules
diff --git a/trunk/user/wireless_tools/CHANGELOG.h → trunk/user/wireless-tools/src/CHANGELOG.h b/trunk/user/wireless_tools/CHANGELOG.h → trunk/user/wireless-tools/src/CHANGELOG.h
diff --git a/trunk/user/wireless_tools/COPYING → trunk/user/wireless-tools/src/COPYING b/trunk/user/wireless_tools/COPYING → trunk/user/wireless-tools/src/COPYING
diff --git a/trunk/user/wireless_tools/DISTRIBUTIONS.txt → ...user/wireless-tools/src/DISTRIBUTIONS.txt b/trunk/user/wireless_tools/DISTRIBUTIONS.txt → ...user/wireless-tools/src/DISTRIBUTIONS.txt
diff --git a/trunk/user/wireless_tools/ESSID-BUG.txt → trunk/user/wireless-tools/src/ESSID-BUG.txt b/trunk/user/wireless_tools/ESSID-BUG.txt → trunk/user/wireless-tools/src/ESSID-BUG.txt
diff --git a/trunk/user/wireless_tools/HOTPLUG-UDEV.txt → .../user/wireless-tools/src/HOTPLUG-UDEV.txt b/trunk/user/wireless_tools/HOTPLUG-UDEV.txt → .../user/wireless-tools/src/HOTPLUG-UDEV.txt
diff --git a/...k/user/wireless_tools/IFRENAME-VS-XXX.txt → ...er/wireless-tools/src/IFRENAME-VS-XXX.txt b/...k/user/wireless_tools/IFRENAME-VS-XXX.txt → ...er/wireless-tools/src/IFRENAME-VS-XXX.txt
diff --git a/trunk/user/wireless_tools/INSTALL → trunk/user/wireless-tools/src/INSTALL b/trunk/user/wireless_tools/INSTALL → trunk/user/wireless-tools/src/INSTALL
diff --git a/trunk/user/wireless_tools/Makefile → trunk/user/wireless-tools/src/Makefile b/trunk/user/wireless_tools/Makefile → trunk/user/wireless-tools/src/Makefile
diff --git a/trunk/user/wireless_tools/PCMCIA.txt → trunk/user/wireless-tools/src/PCMCIA.txt b/trunk/user/wireless_tools/PCMCIA.txt → trunk/user/wireless-tools/src/PCMCIA.txt
diff --git a/trunk/user/wireless_tools/README → trunk/user/wireless-tools/src/README b/trunk/user/wireless_tools/README → trunk/user/wireless-tools/src/README
diff --git a/trunk/user/wireless_tools/README.fr → trunk/user/wireless-tools/src/README.fr b/trunk/user/wireless_tools/README.fr → trunk/user/wireless-tools/src/README.fr
diff --git a/trunk/user/wireless_tools/cs/ifrename.8 → trunk/user/wireless-tools/src/cs/ifrename.8 b/trunk/user/wireless_tools/cs/ifrename.8 → trunk/user/wireless-tools/src/cs/ifrename.8
diff --git a/trunk/user/wireless_tools/cs/iftab.5 → trunk/user/wireless-tools/src/cs/iftab.5 b/trunk/user/wireless_tools/cs/iftab.5 → trunk/user/wireless-tools/src/cs/iftab.5
diff --git a/trunk/user/wireless_tools/cs/iwconfig.8 → trunk/user/wireless-tools/src/cs/iwconfig.8 b/trunk/user/wireless_tools/cs/iwconfig.8 → trunk/user/wireless-tools/src/cs/iwconfig.8
diff --git a/trunk/user/wireless_tools/cs/iwevent.8 → trunk/user/wireless-tools/src/cs/iwevent.8 b/trunk/user/wireless_tools/cs/iwevent.8 → trunk/user/wireless-tools/src/cs/iwevent.8
diff --git a/trunk/user/wireless_tools/cs/iwgetid.8 → trunk/user/wireless-tools/src/cs/iwgetid.8 b/trunk/user/wireless_tools/cs/iwgetid.8 → trunk/user/wireless-tools/src/cs/iwgetid.8
diff --git a/trunk/user/wireless_tools/cs/iwlist.8 → trunk/user/wireless-tools/src/cs/iwlist.8 b/trunk/user/wireless_tools/cs/iwlist.8 → trunk/user/wireless-tools/src/cs/iwlist.8
diff --git a/trunk/user/wireless_tools/cs/iwpriv.8 → trunk/user/wireless-tools/src/cs/iwpriv.8 b/trunk/user/wireless_tools/cs/iwpriv.8 → trunk/user/wireless-tools/src/cs/iwpriv.8
diff --git a/trunk/user/wireless_tools/cs/iwspy.8 → trunk/user/wireless-tools/src/cs/iwspy.8 b/trunk/user/wireless_tools/cs/iwspy.8 → trunk/user/wireless-tools/src/cs/iwspy.8
diff --git a/trunk/user/wireless_tools/cs/wireless.7 → trunk/user/wireless-tools/src/cs/wireless.7 b/trunk/user/wireless_tools/cs/wireless.7 → trunk/user/wireless-tools/src/cs/wireless.7
diff --git a/...er/wireless_tools/fr.ISO8859-1/ifrename.8 → ...ireless-tools/src/fr.ISO8859-1/ifrename.8 b/...er/wireless_tools/fr.ISO8859-1/ifrename.8 → ...ireless-tools/src/fr.ISO8859-1/ifrename.8
diff --git a/.../user/wireless_tools/fr.ISO8859-1/iftab.5 → ...r/wireless-tools/src/fr.ISO8859-1/iftab.5 b/.../user/wireless_tools/fr.ISO8859-1/iftab.5 → ...r/wireless-tools/src/fr.ISO8859-1/iftab.5
diff --git a/...er/wireless_tools/fr.ISO8859-1/iwconfig.8 → ...ireless-tools/src/fr.ISO8859-1/iwconfig.8 b/...er/wireless_tools/fr.ISO8859-1/iwconfig.8 → ...ireless-tools/src/fr.ISO8859-1/iwconfig.8
diff --git a/...ser/wireless_tools/fr.ISO8859-1/iwevent.8 → ...wireless-tools/src/fr.ISO8859-1/iwevent.8 b/...ser/wireless_tools/fr.ISO8859-1/iwevent.8 → ...wireless-tools/src/fr.ISO8859-1/iwevent.8
diff --git a/...ser/wireless_tools/fr.ISO8859-1/iwgetid.8 → ...wireless-tools/src/fr.ISO8859-1/iwgetid.8 b/...ser/wireless_tools/fr.ISO8859-1/iwgetid.8 → ...wireless-tools/src/fr.ISO8859-1/iwgetid.8
diff --git a/...user/wireless_tools/fr.ISO8859-1/iwlist.8 → .../wireless-tools/src/fr.ISO8859-1/iwlist.8 b/...user/wireless_tools/fr.ISO8859-1/iwlist.8 → .../wireless-tools/src/fr.ISO8859-1/iwlist.8
diff --git a/...user/wireless_tools/fr.ISO8859-1/iwpriv.8 → .../wireless-tools/src/fr.ISO8859-1/iwpriv.8 b/...user/wireless_tools/fr.ISO8859-1/iwpriv.8 → .../wireless-tools/src/fr.ISO8859-1/iwpriv.8
diff --git a/.../user/wireless_tools/fr.ISO8859-1/iwspy.8 → ...r/wireless-tools/src/fr.ISO8859-1/iwspy.8 b/.../user/wireless_tools/fr.ISO8859-1/iwspy.8 → ...r/wireless-tools/src/fr.ISO8859-1/iwspy.8
diff --git a/...er/wireless_tools/fr.ISO8859-1/wireless.7 → ...ireless-tools/src/fr.ISO8859-1/wireless.7 b/...er/wireless_tools/fr.ISO8859-1/wireless.7 → ...ireless-tools/src/fr.ISO8859-1/wireless.7
diff --git a/...k/user/wireless_tools/fr.UTF-8/ifrename.8 → ...er/wireless-tools/src/fr.UTF-8/ifrename.8 b/...k/user/wireless_tools/fr.UTF-8/ifrename.8 → ...er/wireless-tools/src/fr.UTF-8/ifrename.8
diff --git a/trunk/user/wireless_tools/fr.UTF-8/iftab.5 → .../user/wireless-tools/src/fr.UTF-8/iftab.5 b/trunk/user/wireless_tools/fr.UTF-8/iftab.5 → .../user/wireless-tools/src/fr.UTF-8/iftab.5
diff --git a/...k/user/wireless_tools/fr.UTF-8/iwconfig.8 → ...er/wireless-tools/src/fr.UTF-8/iwconfig.8 b/...k/user/wireless_tools/fr.UTF-8/iwconfig.8 → ...er/wireless-tools/src/fr.UTF-8/iwconfig.8
diff --git a/trunk/user/wireless_tools/fr.UTF-8/iwevent.8 → ...ser/wireless-tools/src/fr.UTF-8/iwevent.8 b/trunk/user/wireless_tools/fr.UTF-8/iwevent.8 → ...ser/wireless-tools/src/fr.UTF-8/iwevent.8
diff --git a/trunk/user/wireless_tools/fr.UTF-8/iwgetid.8 → ...ser/wireless-tools/src/fr.UTF-8/iwgetid.8 b/trunk/user/wireless_tools/fr.UTF-8/iwgetid.8 → ...ser/wireless-tools/src/fr.UTF-8/iwgetid.8
diff --git a/trunk/user/wireless_tools/fr.UTF-8/iwlist.8 → ...user/wireless-tools/src/fr.UTF-8/iwlist.8 b/trunk/user/wireless_tools/fr.UTF-8/iwlist.8 → ...user/wireless-tools/src/fr.UTF-8/iwlist.8
diff --git a/trunk/user/wireless_tools/fr.UTF-8/iwpriv.8 → ...user/wireless-tools/src/fr.UTF-8/iwpriv.8 b/trunk/user/wireless_tools/fr.UTF-8/iwpriv.8 → ...user/wireless-tools/src/fr.UTF-8/iwpriv.8
diff --git a/trunk/user/wireless_tools/fr.UTF-8/iwspy.8 → .../user/wireless-tools/src/fr.UTF-8/iwspy.8 b/trunk/user/wireless_tools/fr.UTF-8/iwspy.8 → .../user/wireless-tools/src/fr.UTF-8/iwspy.8
diff --git a/...k/user/wireless_tools/fr.UTF-8/wireless.7 → ...er/wireless-tools/src/fr.UTF-8/wireless.7 b/...k/user/wireless_tools/fr.UTF-8/wireless.7 → ...er/wireless-tools/src/fr.UTF-8/wireless.7
diff --git a/trunk/user/wireless_tools/ifrename.8 → trunk/user/wireless-tools/src/ifrename.8 b/trunk/user/wireless_tools/ifrename.8 → trunk/user/wireless-tools/src/ifrename.8
diff --git a/trunk/user/wireless_tools/ifrename.c → trunk/user/wireless-tools/src/ifrename.c b/trunk/user/wireless_tools/ifrename.c → trunk/user/wireless-tools/src/ifrename.c
diff --git a/trunk/user/wireless_tools/iftab.5 → trunk/user/wireless-tools/src/iftab.5 b/trunk/user/wireless_tools/iftab.5 → trunk/user/wireless-tools/src/iftab.5
diff --git a/...eless_tools/iw261_restore_full_essid.diff → ...s-tools/src/iw261_restore_full_essid.diff b/...eless_tools/iw261_restore_full_essid.diff → ...s-tools/src/iw261_restore_full_essid.diff
diff --git a/...eless_tools/iw262_restore_full_essid.diff → ...s-tools/src/iw262_restore_full_essid.diff b/...eless_tools/iw262_restore_full_essid.diff → ...s-tools/src/iw262_restore_full_essid.diff
diff --git a/trunk/user/wireless_tools/iwconfig.8 → trunk/user/wireless-tools/src/iwconfig.8 b/trunk/user/wireless_tools/iwconfig.8 → trunk/user/wireless-tools/src/iwconfig.8
diff --git a/trunk/user/wireless_tools/iwconfig.c → trunk/user/wireless-tools/src/iwconfig.c b/trunk/user/wireless_tools/iwconfig.c → trunk/user/wireless-tools/src/iwconfig.c
diff --git a/trunk/user/wireless_tools/iwevent.8 → trunk/user/wireless-tools/src/iwevent.8 b/trunk/user/wireless_tools/iwevent.8 → trunk/user/wireless-tools/src/iwevent.8
diff --git a/trunk/user/wireless_tools/iwevent.c → trunk/user/wireless-tools/src/iwevent.c b/trunk/user/wireless_tools/iwevent.c → trunk/user/wireless-tools/src/iwevent.c
diff --git a/trunk/user/wireless_tools/iwgetid.8 → trunk/user/wireless-tools/src/iwgetid.8 b/trunk/user/wireless_tools/iwgetid.8 → trunk/user/wireless-tools/src/iwgetid.8
diff --git a/trunk/user/wireless_tools/iwgetid.c → trunk/user/wireless-tools/src/iwgetid.c b/trunk/user/wireless_tools/iwgetid.c → trunk/user/wireless-tools/src/iwgetid.c
diff --git a/trunk/user/wireless_tools/iwlib-private.h → ...k/user/wireless-tools/src/iwlib-private.h b/trunk/user/wireless_tools/iwlib-private.h → ...k/user/wireless-tools/src/iwlib-private.h
diff --git a/trunk/user/wireless_tools/iwlib.c → trunk/user/wireless-tools/src/iwlib.c b/trunk/user/wireless_tools/iwlib.c → trunk/user/wireless-tools/src/iwlib.c
diff --git a/trunk/user/wireless_tools/iwlib.h → trunk/user/wireless-tools/src/iwlib.h b/trunk/user/wireless_tools/iwlib.h → trunk/user/wireless-tools/src/iwlib.h
diff --git a/trunk/user/wireless_tools/iwlist.8 → trunk/user/wireless-tools/src/iwlist.8 b/trunk/user/wireless_tools/iwlist.8 → trunk/user/wireless-tools/src/iwlist.8
diff --git a/trunk/user/wireless_tools/iwlist.c → trunk/user/wireless-tools/src/iwlist.c b/trunk/user/wireless_tools/iwlist.c → trunk/user/wireless-tools/src/iwlist.c
diff --git a/trunk/user/wireless_tools/iwmulticall.c → trunk/user/wireless-tools/src/iwmulticall.c b/trunk/user/wireless_tools/iwmulticall.c → trunk/user/wireless-tools/src/iwmulticall.c
diff --git a/trunk/user/wireless_tools/iwpriv.8 → trunk/user/wireless-tools/src/iwpriv.8 b/trunk/user/wireless_tools/iwpriv.8 → trunk/user/wireless-tools/src/iwpriv.8
diff --git a/trunk/user/wireless_tools/iwpriv.c → trunk/user/wireless-tools/src/iwpriv.c b/trunk/user/wireless_tools/iwpriv.c → trunk/user/wireless-tools/src/iwpriv.c
diff --git a/trunk/user/wireless_tools/iwspy.8 → trunk/user/wireless-tools/src/iwspy.8 b/trunk/user/wireless_tools/iwspy.8 → trunk/user/wireless-tools/src/iwspy.8
diff --git a/trunk/user/wireless_tools/iwspy.c → trunk/user/wireless-tools/src/iwspy.c b/trunk/user/wireless_tools/iwspy.c → trunk/user/wireless-tools/src/iwspy.c
diff --git a/trunk/user/wireless_tools/macaddr.c → trunk/user/wireless-tools/src/macaddr.c b/trunk/user/wireless_tools/macaddr.c → trunk/user/wireless-tools/src/macaddr.c
diff --git a/trunk/user/wireless_tools/sample_enc.c → trunk/user/wireless-tools/src/sample_enc.c b/trunk/user/wireless_tools/sample_enc.c → trunk/user/wireless-tools/src/sample_enc.c
diff --git a/trunk/user/wireless_tools/sample_pm.c → trunk/user/wireless-tools/src/sample_pm.c b/trunk/user/wireless_tools/sample_pm.c → trunk/user/wireless-tools/src/sample_pm.c
diff --git a/trunk/user/wireless_tools/sample_priv_addr.c → ...ser/wireless-tools/src/sample_priv_addr.c b/trunk/user/wireless_tools/sample_priv_addr.c → ...ser/wireless-tools/src/sample_priv_addr.c
diff --git a/trunk/user/wireless_tools/wireless.10.h → trunk/user/wireless-tools/src/wireless.10.h b/trunk/user/wireless_tools/wireless.10.h → trunk/user/wireless-tools/src/wireless.10.h
diff --git a/trunk/user/wireless_tools/wireless.11.h → trunk/user/wireless-tools/src/wireless.11.h b/trunk/user/wireless_tools/wireless.11.h → trunk/user/wireless-tools/src/wireless.11.h
diff --git a/trunk/user/wireless_tools/wireless.12.h → trunk/user/wireless-tools/src/wireless.12.h b/trunk/user/wireless_tools/wireless.12.h → trunk/user/wireless-tools/src/wireless.12.h
diff --git a/trunk/user/wireless_tools/wireless.13.h → trunk/user/wireless-tools/src/wireless.13.h b/trunk/user/wireless_tools/wireless.13.h → trunk/user/wireless-tools/src/wireless.13.h
diff --git a/trunk/user/wireless_tools/wireless.14.h → trunk/user/wireless-tools/src/wireless.14.h b/trunk/user/wireless_tools/wireless.14.h → trunk/user/wireless-tools/src/wireless.14.h
diff --git a/trunk/user/wireless_tools/wireless.15.h → trunk/user/wireless-tools/src/wireless.15.h b/trunk/user/wireless_tools/wireless.15.h → trunk/user/wireless-tools/src/wireless.15.h
diff --git a/trunk/user/wireless_tools/wireless.16.h → trunk/user/wireless-tools/src/wireless.16.h b/trunk/user/wireless_tools/wireless.16.h → trunk/user/wireless-tools/src/wireless.16.h
diff --git a/trunk/user/wireless_tools/wireless.17.h → trunk/user/wireless-tools/src/wireless.17.h b/trunk/user/wireless_tools/wireless.17.h → trunk/user/wireless-tools/src/wireless.17.h
diff --git a/trunk/user/wireless_tools/wireless.18.h → trunk/user/wireless-tools/src/wireless.18.h b/trunk/user/wireless_tools/wireless.18.h → trunk/user/wireless-tools/src/wireless.18.h
diff --git a/trunk/user/wireless_tools/wireless.19.h → trunk/user/wireless-tools/src/wireless.19.h b/trunk/user/wireless_tools/wireless.19.h → trunk/user/wireless-tools/src/wireless.19.h
diff --git a/trunk/user/wireless_tools/wireless.20.h → trunk/user/wireless-tools/src/wireless.20.h b/trunk/user/wireless_tools/wireless.20.h → trunk/user/wireless-tools/src/wireless.20.h
diff --git a/trunk/user/wireless_tools/wireless.21.h → trunk/user/wireless-tools/src/wireless.21.h b/trunk/user/wireless_tools/wireless.21.h → trunk/user/wireless-tools/src/wireless.21.h
diff --git a/trunk/user/wireless_tools/wireless.22.h → trunk/user/wireless-tools/src/wireless.22.h b/trunk/user/wireless_tools/wireless.22.h → trunk/user/wireless-tools/src/wireless.22.h
diff --git a/trunk/user/wireless_tools/wireless.7 → trunk/user/wireless-tools/src/wireless.7 b/trunk/user/wireless_tools/wireless.7 → trunk/user/wireless-tools/src/wireless.7
diff --git a/trunk/user/wireless_tools/.gitignore b/trunk/user/wireless_tools/.gitignore