Changeset 15595


Ignore:
Timestamp:
2009-05-04T19:04:03+02:00 (9 years ago)
Author:
nbd
Message:

rename tools/lzma to tools/lzma-old (preparation for adding a new lzma version)

Location:
trunk/tools
Files:
2 added
2 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/tools/Makefile

    r15365 r15595  
    1313tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4) += gmp mpfr 
    1414tools-y += m4 autoconf automake bison pkg-config sed 
    15 tools-y += sstrip ipkg-utils genext2fs squashfs mtd-utils lzma mkimage 
     15tools-y += sstrip ipkg-utils genext2fs squashfs mtd-utils lzma-old mkimage 
    1616tools-y += firmware-utils patch-cmdline quilt yaffs2 
    1717 
     
    2020 
    2121# builddir dependencies 
    22 $(curdir)/squashfs/compile := $(curdir)/lzma/install 
     22$(curdir)/squashfs/compile := $(curdir)/lzma-old/install 
    2323$(curdir)/quilt/compile := $(curdir)/sed/install 
    2424$(curdir)/dtc/compile := $(curdir)/bison/install 
  • trunk/tools/lzma-old/Makefile

    r15594 r15595  
    2727 
    2828define Host/Install 
    29         $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/ 
     29        $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/liblzma-old.a 
    3030        $(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/ 
    3131endef 
     
    3333define Host/Clean 
    3434        rm -f \ 
    35                 $(STAGING_DIR_HOST)/lib/liblzma.a \ 
     35                $(STAGING_DIR_HOST)/lib/liblzma-old.a \ 
    3636                $(STAGING_DIR_HOST)/bin/lzma 
    3737endef 
  • trunk/tools/squashfs/patches/100-lzma.patch

    r15245 r15595  
    11--- a/squashfs-tools/Makefile 
    22+++ b/squashfs-tools/Makefile 
    3 @@ -1,4 +1,5 @@ 
    4  INCLUDEDIR = . 
    5 +#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib 
    6   
    7  CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 
    8   
    93@@ -7,6 +8,9 @@ all: mksquashfs unsquashfs 
    104 mksquashfs: mksquashfs.o read_fs.o sort.o 
     
    126  
    137+mksquashfs-lzma: mksquashfs.o read_fs.o sort.o 
    14 +       $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@ 
     8+       $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma-old -o $@ 
    159+ 
    1610 mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h 
     
    2216  
    2317+unsquashfs-lzma: unsquashfs.o 
    24 +       $(CXX) unsquashfs.o -L$(LZMAPATH) -llzma -o $@ 
     18+       $(CXX) unsquashfs.o -L$(LZMAPATH) -llzma-old -o $@ 
    2519+ 
    2620 unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h 
Note: See TracChangeset for help on using the changeset viewer.