[libnet] cleanup makefile and update to version 1.1.4

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 30 insertions, 67 deletions

diff --git a/rules/libnet.make b/rules/libnet.make
index 5723cbf4c..5b7804f45 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -17,100 +17,63 @@ PACKAGES-$(PTXCONF_LIBNET) += libnet
 #
 # Paths and names
 #
-LIBNET_VERSION	= 1.1.3-RC-01
-LIBNET		= libnet-$(LIBNET_VERSION)
-LIBNET_SUFFIX	= tar.gz
-LIBNET_URL     = http://www.pengutronix.de/software/ptxdist/temporary-src/$(LIBNET).$(LIBNET_SUFFIX)
-# (temprary?) offline, 20061103
-#LIBNET_URL	= http://www.packetfactory.net/libnet/dist/$(LIBNET).$(LIBNET_SUFFIX)
-LIBNET_SOURCE	= $(SRCDIR)/$(LIBNET).$(LIBNET_SUFFIX)
-LIBNET_DIR	= $(BUILDDIR)/$(LIBNET)
+LIBNET_VERSION	:= 1.1.4
+LIBNET		:= libnet-$(LIBNET_VERSION)
+LIBNET_SUFFIX	:= tar.gz
+LIBNET_URL	:= $(PTXCONF_SETUP_SFMIRROR)/libnet-dev/$(LIBNET).$(LIBNET_SUFFIX)
+LIBNET_SOURCE	:= $(SRCDIR)/$(LIBNET).$(LIBNET_SUFFIX)
+LIBNET_DIR	:= $(BUILDDIR)/$(LIBNET)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-libnet_get: $(STATEDIR)/libnet.get
-
-$(STATEDIR)/libnet.get: $(libnet_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(LIBNET_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, LIBNET)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-libnet_extract: $(STATEDIR)/libnet.extract
-
-$(STATEDIR)/libnet.extract: $(libnet_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(LIBNET_DIR))
-	@$(call extract, LIBNET)
-	mv $(BUILDDIR)/libnet $(LIBNET_DIR)
-	@$(call patchin, LIBNET, $(LIBNET_DIR))
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
 libnet_prepare: $(STATEDIR)/libnet.prepare
 
-LIBNET_PATH	=  PATH=$(CROSS_PATH)
-LIBNET_ENV 	=  $(CROSS_ENV)
-LIBNET_ENV	+= ac_libnet_have_packet_socket=yes
+LIBNET_PATH	:= PATH=$(CROSS_PATH)
+LIBNET_ENV 	:= \
+	$(CROSS_ENV) \
+	ac_libnet_have_packet_socket=yes
 
 #
 # autoconf
 #
-LIBNET_AUTOCONF	=  $(CROSS_AUTOCONF_USR)
-LIBNET_AUTOCONF += --with-pf_packet=yes
+LIBNET_AUTOCONF	:= \
+	$(CROSS_AUTOCONF_USR) \
+	--with-pf_packet=yes
 
-$(STATEDIR)/libnet.prepare: $(libnet_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(LIBNET_BUILDDIR))
-	cd $(LIBNET_DIR) && \
-		$(LIBNET_PATH) $(LIBNET_ENV) \
-		./configure $(LIBNET_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
 # ----------------------------------------------------------------------------
-
-libnet_compile: $(STATEDIR)/libnet.compile
-
-$(STATEDIR)/libnet.compile: $(libnet_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(LIBNET_DIR) && $(LIBNET_PATH) $(LIBNET_ENV) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
+# Target-Install
 # ----------------------------------------------------------------------------
 
-libnet_install: $(STATEDIR)/libnet.install
+$(STATEDIR)/libnet.targetinstall:
+	@$(call targetinfo)
 
-$(STATEDIR)/libnet.install: $(libnet_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, LIBNET)
-	@$(call touch, $@)
+	@$(call install_init, libnet)
+	@$(call install_fixup, libnet,PACKAGE,libnet)
+	@$(call install_fixup, libnet,PRIORITY,optional)
+	@$(call install_fixup, libnet,VERSION,$(LIBNET_VERSION))
+	@$(call install_fixup, libnet,SECTION,base)
+	@$(call install_fixup, libnet,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
+	@$(call install_fixup, libnet,DEPENDS,)
+	@$(call install_fixup, libnet,DESCRIPTION,missing)
 
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
+	@$(call install_copy, libnet, 0, 0, 0644, -, /usr/lib/libnet.so.1.5.0)
+	@$(call install_link, libnet, libnet.so.1.5.0, /usr/lib/libnet.so.1)
+	@$(call install_link, libnet, libnet.so.1.5.0, /usr/lib/libnet.so)
 
-libnet_targetinstall: $(STATEDIR)/libnet.targetinstall
+	@$(call install_finish, libnet)
 
-$(STATEDIR)/libnet.targetinstall: $(libnet_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-	# FIXME: nothing to do?
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean