X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibnfnetlink%2FMakefile;h=f704d19e8ee69e3e88cd44392ea4600b894f6848;hp=6b60408ec6fc51501f0355b3decacab1a0502a00;hb=73d77a661471eb63ac4b433b32703bbc19427a92;hpb=15ad9417042fc195b7199c37a2e38b297755356d

diff --git a/libs/libnfnetlink/Makefile b/libs/libnfnetlink/Makefile
index 6b60408ec6..f704d19e8e 100644
--- a/libs/libnfnetlink/Makefile
+++ b/libs/libnfnetlink/Makefile
@@ -1,23 +1,20 @@
-# 
-# Copyright (C) 2007 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.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnfnetlink
-PKG_VERSION:=0.0.30
-PKG_RELEASE:=0
+PKG_VERSION:=0.0.41
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnfnetlink/
-PKG_MD5SUM:=7fd3c8ddc03d42fa9f0177a17a38f163
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnfnetlink/ \
+	http://mirrors.evolva.ro/netfilter.org/libnfnetlink/
+PKG_MD5SUM:=5d844ea1f557bad0364d5b85cd10c796
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,49 +22,50 @@ define Package/libnfnetlink
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
-  TITLE:=libnfnetlink
-  URL:=http://netfilter.org/projects/libnfnetlink/index.html
+  TITLE:=A low-level library for netfilter related kernel/userspace communication
+  URL:=http://netfilter.org/projects/libnfnetlink/
 endef
 
 define Package/libnfnetlink/description
- libnfnetlink is is the low-level library for netfilter related kernel/userspace communication. 
- It provides a generic messaging infrastructure for in-kernel netfilter subsystems 
- (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users 
+ libnfnetlink is is the low-level library for netfilter related kernel/userspace communication.
+ It provides a generic messaging infrastructure for in-kernel netfilter subsystems
+ (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users
  and/or management tools in userspace.
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
 	--enable-static \
 	--enable-shared
 
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)"
-
-
 define Build/Compile
-	# pass CFLAGS again to override -O2 set by configure
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-
 define Build/InstallDev
-	mkdir -p $(1)/usr/include/libnfnetlink
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink}.h $(1)/usr/include/libnfnetlink/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} $(1)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf	$(1)/usr/include/libnfnetlink \
-		$(1)/usr/lib/libnfnetlink.{a,so*}
+	$(INSTALL_DIR) $(1)/usr/include/libnfnetlink
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink,linux_nfnetlink_compat}.h \
+		$(1)/usr/include/libnfnetlink/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} \
+		$(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfnetlink.pc \
+		$(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libnfnetlink/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.so.* $(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.so.* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libnfnetlink))