mostly cosmetic sync with the mainline bubinga code

[openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 01438a6..dc45697 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,7 +1,14 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/host.mk
 
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
@@ -11,30 +18,33 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 
 all: compile
 
-$(BIN_DIR)/$(SDK_NAME).tar.bz2:
-       (cd $(STAGING_DIR); \
+$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
+       mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
+       $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
+       $(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
+               $(TAR) -xf - -C $(SDK_BUILD_DIR)
+       (cd $(SDK_BUILD_DIR)/staging_dir_$(ARCH); \
                rm -rf info man share stampfiles; \
                cd usr; \
                rm -rf doc info man share; \
        )
-       rm -rf $(SDK_BUILD_DIR)
-       mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
-       $(CP) $(STAGING_DIR) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/
-       $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile
+       $(CP) ./files/Makefile $(SDK_BUILD_DIR)/
        $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
-       echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
-       find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf 
-       find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 
+       $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
+       echo OPENWRTVERSION:="$(OPENWRTVERSION)" > $(SDK_BUILD_DIR)/.version.mk
+       rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache
+       find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+       find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
        (cd $(BUILD_DIR); \
                tar cfj $@ $(SDK_NAME); \
        )
 
-source:
+download:
 prepare:
 compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
-install:
+install: compile
 
 clean:
        rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2