fix wpa_supplicant cflags

[openwrt.git] / package / libpcap / Makefile

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 960caf1..d7956a6 100644 (file)
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk


@@ -6,92 +12,51 @@ PKG_NAME:=libpcap
 PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
 
 PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974

-PKG_CAT:=zcat

 
 

-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk

 
 define Package/libpcap
 
 define Package/libpcap

- SECTION:=base
- CATEGORY:=Libraries
- TITLE:=Low-level packet capture library
- DESCRIPTION:=A system-independent library for user-level network packet capture.
- URL:=http://www.tcpdump.org/
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Low-level packet capture library
+  URL:=http://www.tcpdump.org/

 endef
 
 endef
 

-define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_linux_vers= \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-shared \
-                       --enable-static \
-                       --disable-yydebug \
-                       --enable-ipv6 \
-                       --with-build-cc=$(HOSTCC) \
-                       --with-pcap=linux \
-       );
+define Package/libpcap/description
+ This package contains a system-independent library for user-level network 
+ packet capture.

 endef
 
 endef
 

+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --disable-yydebug \
+       --enable-ipv6 \
+       --with-build-cc="$(HOSTCC)" \
+       --with-pcap=linux
+

 define Build/Compile
 define Build/Compile

-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)

        $(MAKE) -C $(PKG_BUILD_DIR) \
                CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 

-define Package/libpcap/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
-endef
-

 define Build/InstallDev
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/pcap.h \
-               $(PKG_INSTALL_DIR)/usr/include/pcap-bpf.h \
-               $(PKG_INSTALL_DIR)/usr/include/pcap-namedb.h \
-               $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libpcap.a \
-               $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* \
-               $(STAGING_DIR)/usr/lib/
+       mkdir -p $(1)/usr/include
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/pcap{,-bpf,-namedb}.h \
+               $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \
+               $(1)/usr/lib/

 endef
 
 endef
 

-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/pcap.h \
-               $(STAGING_DIR)/usr/include/pcap-bpf.h \
-               $(STAGING_DIR)/usr/include/pcap-namedb.h \
-               $(STAGING_DIR)/usr/lib/libpcap.a \
-               $(STAGING_DIR)/usr/lib/libpcap.so*
+define Package/libpcap/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,libpcap))
 endef
 
 $(eval $(call BuildPackage,libpcap))