[packages] libnetfilter-{log,queue}: don't include kernel.mk anymore, use PKG_INSTALL

SVN-Revision: 20077

diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile
index 15de5523f3c49fc0eb01b745d0fc7aaebd8184db..fc60e49d676c01e599854e5e8c06ad1b69803e02 100644 (file)
--- a/libs/libnetfilter-log/Makefile
+++ b/libs/libnetfilter-log/Makefile
@@ -1,12 +1,11 @@
 #
 #

-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk

-include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=libnetfilter_log
 PKG_VERSION:=0.0.16
 
 PKG_NAME:=libnetfilter_log
 PKG_VERSION:=0.0.16


@@ -20,6 +19,7 @@ PKG_SOURCE_URL:= \
 PKG_MD5SUM:=4ffcf46dad9d0c81f6611dd185639694
 
 PKG_FIXUP:=libtool
 PKG_MD5SUM:=4ffcf46dad9d0c81f6611dd185639694
 
 PKG_FIXUP:=libtool

+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -46,12 +46,6 @@ CONFIGURE_VARS += \
        LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
        LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"
 
        LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
        LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-

 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/libnetfilter_log
        $(INSTALL_DATA) \
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/libnetfilter_log
        $(INSTALL_DATA) \

diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index adaa3f6b78dc9218d19593dfb93685f6b0a9cd11..b7d9fdfc2491b9066af2f70aaaddbc506a691510 100644 (file)
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -1,12 +1,11 @@
 #
 #

-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk

-include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=libnetfilter_queue
 PKG_VERSION:=0.0.17
 
 PKG_NAME:=libnetfilter_queue
 PKG_VERSION:=0.0.17


@@ -20,6 +19,7 @@ PKG_SOURCE_URL:= \
 PKG_MD5SUM:=2cde35e678ead3a8f9eb896bf807a159
 
 PKG_FIXUP:=libtool
 PKG_MD5SUM:=2cde35e678ead3a8f9eb896bf807a159
 
 PKG_FIXUP:=libtool

+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -46,12 +46,6 @@ CONFIGURE_VARS += \
        LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
        LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"
 
        LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
        LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-

 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue
        $(INSTALL_DATA) \
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue
        $(INSTALL_DATA) \