Changeset d419478 in freewrt for package/click

Timestamp:

Jul 21, 2006, 1:56:32 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

50d34d3

Parents:

2029b2e

Message:

• whitespace cleanup, while here
• move WRKDIR and DISTFILES definition into PKG_template
• define WRKDIR via parent BUILD_DIR instead of going up from WRKSRC
• use a sub-directory as WRKDIR, like BSD
• rename PKG_BUILD_DIR into WRKBUILD
• define WRKBUILD relative via WRKDIR
• rename PKG_INSTALL_DIR into WRKINST
• fix a few dependencies
• make use of common cases in the definition of WRKBUILD and WRKINST, removing many redundant lines
• use WRKDIR instead of BUILD_DIR in places where the latter was used previously
• while here, remove PKG_CAT stuff

this only affects packages, for now

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@303 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/click/Makefile (modified) (5 diffs)

package/click/Makefile

@@ -12 +12 @@
 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
 
 include $(TOPDIR)/package/rules.mk
@@ -22 +19 @@
 $(eval $(call PKG_template,ROOFNET,roofnet,$(ROOFNET_VERSION),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); \
                 ./configure; \
                 cp include/click/config.h include/click/config-host.h; \
@@ -47 +44 @@
 # don't build the full click (it's huge), but only include
 # the elements needed for roofnet
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                BUILD_CXX="g++ -include $(PKG_BUILD_DIR)/include/click/config-host.h" \
+$(WRKBUILD)/.built: $(WRKBUILD)/.configured
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
+                BUILD_CXX="g++ -include $(WRKBUILD)/include/click/config-host.h" \
                 tools elementmap.xml
-        (cd $(PKG_BUILD_DIR)/userlevel; \
+        (cd $(WRKBUILD)/userlevel; \
                 ../tools/click-mkmindriver/click-mkmindriver -p roofnet -C .. \
-                        -f $(PKG_BUILD_DIR)/conf/wifi/sample.click \
+                        -f $(WRKBUILD)/conf/wifi/sample.click \
                         -A --all -E IPNameInfo -E FromHost -E ToHost -E Discard; \
                 $(MAKE) -f Makefile.roofnet; \
@@ -63 +60 @@
 $(IPKG_CLICK):
         install -d -m0755 $(IDIR_CLICK)/usr/bin
-        $(CP) $(PKG_BUILD_DIR)/userlevel/roofnetclick $(IDIR_CLICK)/usr/bin/click 
-        $(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(IDIR_CLICK)/usr/bin/click-align
+        $(CP) $(WRKBUILD)/userlevel/roofnetclick $(IDIR_CLICK)/usr/bin/click 
+        $(CP) $(WRKBUILD)/tools/click-align/click-align $(IDIR_CLICK)/usr/bin/click-align
         $(RSTRIP) $(IDIR_CLICK)
         $(IPKG_BUILD) $(IDIR_CLICK) $(PACKAGE_DIR)
@@ -71 +68 @@
 $(IPKG_ROOFNET):
         install -d -m0755 $(IDIR_ROOFNET)/usr/bin
-        $(CP) $(PKG_BUILD_DIR)/conf/wifi/gen_config_roofnet.sh $(IDIR_ROOFNET)/usr/bin
-        $(CP) $(PKG_BUILD_DIR)/conf/wifi/srcr.click $(IDIR_ROOFNET)/usr/bin
-        $(CP) $(PKG_BUILD_DIR)/conf/wifi/read_handler $(IDIR_ROOFNET)/usr/bin
-        $(CP) $(PKG_BUILD_DIR)/conf/wifi/write_handler $(IDIR_ROOFNET)/usr/bin
+        $(CP) $(WRKBUILD)/conf/wifi/gen_config_roofnet.sh $(IDIR_ROOFNET)/usr/bin
+        $(CP) $(WRKBUILD)/conf/wifi/srcr.click $(IDIR_ROOFNET)/usr/bin
+        $(CP) $(WRKBUILD)/conf/wifi/read_handler $(IDIR_ROOFNET)/usr/bin
+        $(CP) $(WRKBUILD)/conf/wifi/write_handler $(IDIR_ROOFNET)/usr/bin
         mkdir -p $(IDIR_ROOFNET)/etc/init.d
         install -m 755 ./files/S50roofnet $(IDIR_ROOFNET)/etc/init.d/