[packages] libflac: Upgrade to 1.2.1

[openwrt/svn-archive/archive.git] / libs / libnet-1.1.x / Makefile

diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile
index b60939ab72e5a883caa2600f657861310eb9c0ff..e8a5e70603d4e06d2b1c3dd48edb4a9e6563e31f 100644 (file)
--- a/libs/libnet-1.1.x/Makefile
+++ b/libs/libnet-1.1.x/Makefile
@@ -1,23 +1,24 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 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:=libnet
 PKG_VERSION:=1.1.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/
 PKG_MD5SUM:=be845c41170d72c7db524f3411b50256
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,6 +35,8 @@ ifeq ($(CONFIG_BIG_ENDIAN),y)
   ENDIANESS:=big
 endif
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -55,20 +58,12 @@ define Build/Configure
        $(call Build/Configure/Default)
 endef
 
-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/lib/libnet-1.1.x/bin
+       $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/
-       mkdir -p $(1)/usr/lib/libnet-1.1.x/include
+       $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.1.x/include/
-       mkdir -p $(1)/usr/lib/libnet-1.1.x/lib
+       $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.1.x/lib/
 endef