From 705cbdee3bd6b8737f6323b5f18579b91e08e304 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 9 Mar 2010 00:38:56 +0000 Subject: [PATCH] [packages] libnetfilter-{log,queue}: don't include kernel.mk anymore, use PKG_INSTALL SVN-Revision: 20077 --- libs/libnetfilter-log/Makefile | 10 ++-------- libs/libnetfilter-queue/Makefile | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile index 15de5523f3..fc60e49d67 100644 --- 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 -include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=libnetfilter_log PKG_VERSION:=0.0.16 @@ -20,6 +19,7 @@ PKG_SOURCE_URL:= \ PKG_MD5SUM:=4ffcf46dad9d0c81f6611dd185639694 PKG_FIXUP:=libtool +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -46,12 +46,6 @@ CONFIGURE_VARS += \ 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) \ diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile index adaa3f6b78..b7d9fdfc24 100644 --- 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 -include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=libnetfilter_queue PKG_VERSION:=0.0.17 @@ -20,6 +19,7 @@ PKG_SOURCE_URL:= \ PKG_MD5SUM:=2cde35e678ead3a8f9eb896bf807a159 PKG_FIXUP:=libtool +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -46,12 +46,6 @@ CONFIGURE_VARS += \ 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) \ -- 2.30.2