X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/245d7dd2a1a88c1ea6d9aef2a638c52af0982ee7..dc97347cdf6a1987c40d6285e5b1674dddb9e252:/openwrt/package/libnet/Makefile

diff --git a/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile
index f628f1b35..97b228e98 100644
--- a/openwrt/package/libnet/Makefile
+++ b/openwrt/package/libnet/Makefile
@@ -7,9 +7,7 @@ PKG_VERSION:=1.0.2a
 PKG_RELEASE:=7
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
 
-PKG_SOURCE_URL:=\
-	http://www.packetfactory.net/libnet/dist/deprecated/ \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -20,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBNET,libnet,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		touch configure.in; \
 		touch include.m4; \
@@ -58,19 +56,19 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		--enable-static \
 		--with-pf_packet=yes \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)"
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 
-$(IPKG_LIBNET): $(STAGING_DIR)/usr/lib/libnet.so
+$(IPKG_LIBNET):
 	install -m0755 -d $(IDIR_LIBNET)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBNET)
@@ -83,14 +81,15 @@ $(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $(STAGING_DIR)/usr/lib/libnet.so
+	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libnet.so
 
 uninstall-dev:
-	rm -rf $(STAGING_DIR)/usr/bin/libnet-config
-	rm -rf $(STAGING_DIR)/usr/include/libnet*
-	rm -rf $(STAGING_DIR)/usr/lib/libnet.{a,so*}
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/libnet-config \
+		$(STAGING_DIR)/usr/include/libnet*  \
+		$(STAGING_DIR)/usr/lib/libnet.{a,so*} \
 
 compile: install-dev
 clean: uninstall-dev