X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fclick%2FMakefile;h=ef48d799ded67330b8087f9af2e21fa12bc9d72d;hb=59353f8d87e13da04e9c07bacaf242ff4aef8700;hp=af39767e7df8d5747e91d9d2023bc7c5a1705201;hpb=5360edce8f45be94248e74df88c9c3c4206bf3ce;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/click/Makefile b/net/click/Makefile
index af39767e7d..ef48d799de 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -1,107 +1,75 @@
-# 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:=click
-PKG_VERSION:=cvs.2006.03.02
+PKG_VERSION:=20101020
 PKG_RELEASE:=1
-PKG_MD5SUM:=7aed4ba94926010d76febb797b288e98
-
-ROOFNET_VERSION:=0.0.1
+PKG_REV:=8f521a2dcd58ea8205b3b6070be605a21fb9154b
 
-PKG_SOURCE_URL:=http://pdos.csail.mit.edu/~jbicket/click_snapshots/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=git://read.cs.ucla.edu/git/click
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_MD5SUM:=c3cba1c923d0a034cc518720b5ba7b40
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/click
-  SECTION:=net
-  CATEGORY:=Network
-  MENU:=1
-  TITLE:=The Click Modular Router
-  DESCRIPTION:=The Click Modular Router
-  URL:=http://pdos.csail.mit.edu/click/
+	SECTION:=net
+	CATEGORY:=Network
+	DEPENDS:=@BROKEN
+	TITLE:=Click Modular Router
+	URL:=http://read.cs.ucla.edu/click
 endef
 
-define Package/roofnet
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=click
-  TITLE:=roofnet mesh networking scripts
-  DESCRIPTION:=roofnet mesh networking scripts
-  URL:=http://pdos.csail.mit.edu/roofnet/
+define Package/click/Description
+	The Click Modular Router userspace package
 endef
 
-BUILDOPTS = \
-		BUILD_CXX="g++ -I $(PKG_BUILD_DIR)/include-host" \
-		BUILD_DL_LIBS="-ldl"
+TARGET_CFLAGS += "-static -O2 -MD"
+TARGET_CXXFLAGS += "-static -O2 -MD"
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		rm -rf config.{cache,status} ; \
-		CONFIG_SITE= \
-		./configure; \
-		rm -rf include-host; \
-		$(CP) include include-host; \
-		rm -rf config.{cache,status} ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CXXFLAGS="-static -O2 -MD" \
-		CFLAGS="-static -MD" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		$(BUILDOPTS) \
 		./configure \
-		  --prefix=/usr \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --enable-wifi \
-		  --disable-linuxmodule \
-		  --enable-tools=mixed \
-	   	  --disable-dynamic-linking \
+			--prefix=/usr \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_HOST_NAME) \
+			--build=$(GNU_BUILD_NAME) \
+			--enable-tools=mixed \
+			--enable-userlevel \
+			--enable-wifi \
+			--enable-fixincludes \
+			--disable-linuxmodule \
 	)
 endef
 
-
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(CONF_OPTS) \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(BUILDOPTS) \
 		tools elementmap.xml
 	(cd $(PKG_BUILD_DIR)/userlevel; \
-		../tools/click-mkmindriver/click-mkmindriver -p roofnet -C .. \
-			-f $(PKG_BUILD_DIR)/conf/wifi/sample.click \
-			-A --all -E IPNameInfo -E FromHost -E ToHost -E Discard; \
-		$(MAKE) -f Makefile.roofnet; \
+		../tools/click-mkmindriver/click-mkmindriver -p $(PKG_NAME) -C .. \
+		-f $(PKG_BUILD_DIR)/conf/wifi/dump.click \
+		-A --all -E Discard -E Print; \
 	)
+	$(MAKE) -C $(PKG_BUILD_DIR) MINDRIVER=$(PKG_NAME)
 endef
 
 define Package/click/install
+	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/userlevel/roofnetclick $(1)/usr/bin/click 
+	$(INSTALL_DIR) $(1)/usr/share/click
+	$(CP) $(PKG_BUILD_DIR)/userlevel/$(PKG_NAME)click $(1)/usr/bin/click
 	$(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(1)/usr/bin/click-align
-endef
-
-define Package/roofnet/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/conf/wifi/gen_config_roofnet.sh $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/conf/wifi/srcr.click $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/conf/wifi/read_handler $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/conf/wifi/write_handler $(1)/usr/bin
-	mkdir -p $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/roofnet.init $(1)/etc/init.d/roofnet
+	$(CP) $(PKG_BUILD_DIR)/elementmap.xml $(1)/usr/share/click/elementmap.xml
 endef
 
 $(eval $(call BuildPackage,click))
-$(eval $(call BuildPackage,roofnet))