enable slab, disable slob - for better performance (#583)

[openwrt-10.03/.git] / target / lzma / Makefile

diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index 6e846c31c9dad61653542638ff8bd943b56c1dd0..b358a9efce8f0d6a10eca672e070864e7b2f0d07 100644 (file)
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -7,28 +7,28 @@
 include $(TOPDIR)/rules.mk
 
 LZMA_DIR=$(BUILD_DIR)/lzma
-LZMA_SOURCE=lzma406.zip
-LZMA_SITE=http://www.7-zip.org/dl
-LZMA_MD5=a09378411cba5f786b5c49c9c58496df
+LZMA_SOURCE=lzma432.tar.bz2
+LZMA_SITE=@SF/sevenzip
+LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
 
-LZMA_LIB_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Lib
-LZMA_ALONE_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib
+LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
 
 TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
 
 $(DL_DIR)/$(LZMA_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE)
 
 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) 
        @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
-       unzip -q $^ -d $(LZMA_DIR)
-       patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch $(MAKE_TRACE)
+       tar xjf $^ -C $(LZMA_DIR)
+       patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch
        touch $(LZMA_DIR)/.unpacked
        
 $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
 $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
-       $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
-       $(MAKE) -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
+       $(MAKE) -C $(LZMA_LIB_DIR)
+       $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR)
        touch $@
 
 lzma: $(TARGETS)
@@ -36,18 +36,18 @@ lzma: $(TARGETS)
 
 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
 
-lzma-clean:
-       -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
-       -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
+lzma-clean: FORCE
+       -$(MAKE) -C $(LZMA_LIB_DIR) clean
+       -$(MAKE) -C $(LZMA_ALONE_DIR) clean
        rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma
 
-lzma-dirclean:
+lzma-dirclean: FORCE
        rm -rf $(LZMA_DIR)
 
 #############################################################
 
 prepare: $(LZMA_DIR)/.unpacked
 compile: lzma
-install: lzma
+install: lzma FORCE
        $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean