Upgrade to mutt-1.5.11, fixes gcc-4 specific errors, close #426

[openwrt.git] / package / sdk / Makefile

diff --git a/package/sdk/Makefile b/package/sdk/Makefile
index 53208cb..3f62aec 100644 (file)
--- a/package/sdk/Makefile
+++ b/package/sdk/Makefile
@@ -7,10 +7,8 @@ PKG_CPU:=$(shell uname -m)
 
 PKG_RELEASE:=1
 SDK_NAME:=OpenWrt-SDK-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE)
-IB_NAME:=OpenWrt-ImageBuilder-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE)
 
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
-IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 
 all: compile
 
@@ -22,14 +20,15 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
        )
        rm -rf $(SDK_BUILD_DIR)
        mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/examples $(SDK_BUILD_DIR)/package
-       cp -a $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
-       cp -a $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples
-       cp $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/
-       cp ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile
-       cp ./files/README.SDK $(SDK_BUILD_DIR)/
-       cp ./files/depend.mk $(SDK_BUILD_DIR)/package/
-       cp $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/
+       $(CP) $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
+       $(CP) $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples
+       $(CP) $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/
+       $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile
+       $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
+       $(CP) ./files/depend.mk $(SDK_BUILD_DIR)/package/
+       $(CP) $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/
        egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config
+       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); \
@@ -38,9 +37,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
 source:
 prepare:
 compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
-# FIXME: image builder disabled for now. need to find a way to make it work cleanly with the new kernel structure
-# $(BIN_DIR)/$(IB_NAME).tar.bz2
 install:
 
 clean:
-       rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2 $(BIN_DIR)/$(IB_NAME).tar.bz2
+       rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2