Changeset 8e4e7a3 in freewrt for tools/lzma

Timestamp:

Jul 16, 2006, 5:11:43 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

c6ac237

Parents:

807b7c3

Message:

use ${EXTRACT_CMD}

to be tested RSN

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

File:

• tools/lzma/Makefile (modified) (2 diffs)

tools/lzma/Makefile

@@ -2 +2 @@
 
 include $(TOPDIR)/rules.mk
+include ../rules.mk
 
-LZMA_DIR=$(TOOLCHAIN_BUILD_DIR)/lzma
-LZMA_SOURCE=lzma432.tar.bz2
+WRKDIR=$(TOOLCHAIN_BUILD_DIR)/lzma
+SOURCE=lzma432.tar.bz2
 LZMA_SITE=@SF/sevenzip
 LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
 
-LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib
-LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Lib
+LZMA_ALONE_DIR=$(WRKDIR)/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)
+$(DL_DIR)/$(SOURCE):
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
 
-$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) 
-        @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
-        bzcat $^ | (cd $(LZMA_DIR); $(TAR_EXTRACT) )
-        patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
-        touch $(LZMA_DIR)/.unpacked
+$(WRKDIR)/.unpacked: $(DL_DIR)/$(SOURCE) 
+        ${EXTRACT_CMD}
+        patch -d $(WRKDIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
+        touch $(WRKDIR)/.unpacked
         
-$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
-$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
+$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKDIR)/.built
+$(WRKDIR)/.built: $(WRKDIR)/.unpacked
         $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
         $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
@@ -29 +29 @@
 
 lzma: $(TARGETS)
-        $(CP) $^ $(LZMA_DIR)
+        $(CP) $^ $(WRKDIR)
 
-lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
+lzma-source: $(DL_DIR)/$(SOURCE)
 
 lzma-clean:
         -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
         -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
-        rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma
+        rm -f $(WRKDIR)/liblzma.a $(WRKDIR)/lzma
 
 lzma-dirclean:
-        rm -rf $(LZMA_DIR)
+        rm -rf $(WRKDIR)
 
 #############################################################
 
-prepare: $(LZMA_DIR)/.unpacked
+prepare: $(WRKDIR)/.unpacked
 compile: lzma
 install: lzma
-        $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
+        $(CP) $(WRKDIR)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean