fix the Aruba ethernet drivers for 2.6.17

[openwrt.git] / target / lzma / Makefile

diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index ac25703..b358a9e 100644 (file)
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -7,12 +7,12 @@
 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
 
@@ -21,33 +21,33 @@ $(DL_DIR)/$(LZMA_SOURCE):
 
 $(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
+       tar xjf $^ -C $(LZMA_DIR)
+       patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch
        touch $(LZMA_DIR)/.unpacked
-
-$(LZMA_LIB_DIR)/liblzma.a: $(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)
-
-$(LZMA_ALONE_DIR)/lzma: $(LZMA_DIR)/.unpacked
-       $(MAKE) -C $(LZMA_ALONE_DIR)
+       $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR)
+       touch $@
 
 lzma: $(TARGETS)
-       cp -f $^ $(LZMA_DIR)
+       $(CP) $^ $(LZMA_DIR)
 
 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
 
-lzma-clean:
+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
-       cp $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
+install: lzma FORCE
+       $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean