[packages] libnetfilter-queue: update to v0.0.16, add dependency on kmod-nfnetlink...

[openwrt/svn-archive/archive.git] / libs / libnetfilter-queue / Makefile

diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index a5a20f4645ebc3a7f2b441bf0bb5e0f68af1972e..cc80a9fe6c0f855c6143a600bdd628a2692d5719 100644 (file)
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,13 +7,15 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=libnetfilter_queue
-PKG_VERSION:=0.0.13
+PKG_VERSION:=0.0.16
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnetfilter_queue/
-PKG_MD5SUM:=660cbfd3dc8c10bf9b1803cd2b688256
+PKG_MD5SUM:=b36664e6cd39edbfe46b416a86118add
+
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,15 +23,14 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libnetfilter-queue
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink
-  TITLE:=libnetfilter_queue
-  URL:=http://www1.cs.columbia.edu/~angelos/libnetfilter_queue.html
+  DEPENDS:=@LINUX_2_6 +libnfnetlink +kmod-nfnetlink-queue
+  TITLE:=API to packets queued by the kernel packet filter
+  URL:=http://www.netfilter.org/projects/libnetfilter_queue/
 endef
 
 define Package/libnetfilter-queue/description
-       libnetfilter_queue is a userspace library providing an API to packets
-       that have been queued by the kernel packet filter. It is is part of a system
-       that deprecates the old ip_queue / libipq mechanism.
+ libnetfilter_queue is a userspace library providing an API to packets
+ that have been queued by the kernel packet filter.
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -37,19 +38,15 @@ TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
        --enable-static \
        --enable-shared \
+
+CONFIGURE_VARS += \
        LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \
        LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
 
-MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS)"
-
-
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+       $(MAKE) -C $(PKG_BUILD_DIR) all
+       $(call libtool_fixup_libdir)
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
 
@@ -60,19 +57,19 @@ define Build/InstallDev
                $(1)/usr/include/libnetfilter_queue/
 
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,la} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a,la} \
                $(1)/usr/lib/
 
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \
                $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libnetfilter-queue/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libnetfilter-queue))