projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[packages] kismet: Don't add host include paths
[openwrt/svn-archive/archive.git]
/
net
/
kismet
/
Makefile
diff --git
a/net/kismet/Makefile
b/net/kismet/Makefile
index 1d32e5cc3066c54e9c2ece4e126292e51a514ceb..d3ab3adfdb9657d5dd772fdd1d2461e2c4decf67 100644
(file)
--- a/
net/kismet/Makefile
+++ b/
net/kismet/Makefile
@@
-9,13
+9,13
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=kismet
PKG_VERSION:=2009-06-R1
PKG_NAME:=kismet
PKG_VERSION:=2009-06-R1
-PKG_RELEASE:=
1
+PKG_RELEASE:=
2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.kismetwireless.net/code
PKG_MD5SUM:=8d77138020ace39f175a906dc0d3b267
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.kismetwireless.net/code
PKG_MD5SUM:=8d77138020ace39f175a906dc0d3b267
-PKG_BUILD_DEPENDS:=libpcap libncurses uclibcxx
+PKG_BUILD_DEPENDS:=libpcap libncurses uclibcxx
libpcre
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
@@
-40,10
+40,7
@@
$(call Package/kismet/Default)
endef
define Package/kismet-client/conffiles
endef
define Package/kismet-client/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
/etc/kismet/kismet.conf
/etc/kismet/kismet.conf
-/etc/kismet/kismet_ui.conf
endef
define Package/kismet-client/description
endef
define Package/kismet-client/description
@@
-53,7
+50,7
@@
endef
define Package/kismet-drone
$(call Package/kismet/Default)
define Package/kismet-drone
$(call Package/kismet/Default)
- DEPENDS+= +libpcap
+ DEPENDS+= +libpcap
+libpcre
TITLE+= drone
endef
TITLE+= drone
endef
@@
-68,13
+65,11
@@
endef
define Package/kismet-server
$(call Package/kismet/Default)
define Package/kismet-server
$(call Package/kismet/Default)
- DEPENDS+= +libpcap
+ DEPENDS+= +libpcap
+libpcre
TITLE+= server
endef
define Package/kismet-server/conffiles
TITLE+= server
endef
define Package/kismet-server/conffiles
-/etc/kismet/ap_manuf
-/etc/kismet/client_manuf
/etc/kismet/kismet.conf
endef
/etc/kismet/kismet.conf
endef
@@
-88,10
+83,10
@@
CONFIGURE_ARGS += \
CONFIGURE_VARS += \
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
CONFIGURE_VARS += \
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
- CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++
-I$(LINUX_DIR)/include
" \
+ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
LDFLAGS="$$$$LDFLAGS" \
LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
LDFLAGS="$$$$LDFLAGS" \
LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
- CLIENTLIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
+ CLIENT
C
LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
@@
-107,26
+102,21
@@
endef
define Package/kismet-client/install
$(INSTALL_DIR) $(1)/etc/kismet/
define Package/kismet-client/install
$(INSTALL_DIR) $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/kismet_ui.conf $(1)/etc/kismet/
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/
endef
define Package/kismet-drone/install
$(INSTALL_DIR) $(1)/etc/kismet/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/
endef
define Package/kismet-drone/install
$(INSTALL_DIR) $(1)/etc/kismet/
- $(INSTALL_
DATA) ./files
/kismet_drone.conf $(1)/etc/kismet/
+ $(INSTALL_
CONF) $(PKG_BUILD_DIR)/conf
/kismet_drone.conf $(1)/etc/kismet/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/
endef
define Package/kismet-server/install
$(INSTALL_DIR) $(1)/etc/kismet/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/
endef
define Package/kismet-server/install
$(INSTALL_DIR) $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/ap_manuf $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/client_manuf $(1)/etc/kismet/
- $(INSTALL_DATA) ./files/kismet.conf $(1)/etc/kismet/
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/
endef
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/
endef