X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Flibnet-1.1.x%2FMakefile;h=d2895c67e9ba99b3f6b1f7dc927c137957fe3a57;hb=c771aec6c1a1c548a9d879c76e449c4e4068dfef;hp=198d09bccf9df2653781d2bd6b27ef041915aae0;hpb=74dc198393dbc2ad97eae13c295c45f074183a8c;p=packages.git

diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile
index 198d09bcc..d2895c67e 100644
--- a/libs/libnet-1.1.x/Makefile
+++ b/libs/libnet-1.1.x/Makefile
@@ -1,16 +1,15 @@
-# 
-# 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/
@@ -18,6 +17,9 @@ PKG_MD5SUM:=be845c41170d72c7db524f3411b50256
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/libnet
 
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libnet1
@@ -33,6 +35,8 @@ ifeq ($(CONFIG_BIG_ENDIAN),y)
   ENDIANESS:=big
 endif
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
@@ -41,7 +45,7 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	ac_cv_libnet_endianess=$(ENDIANESS) \
 	ac_libnet_have_pf_packet=yes \
-	LL_INT_TYPE=linux
+	LL_INT_TYPE=libnet_link_linux
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); touch \
@@ -54,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