OpenWrt – Blame information for rev 4

Subversion Repositories:
Rev:
Rev Author Line No. Line
4 office 1 --- a/squashfs-tools/Makefile
2 +++ b/squashfs-tools/Makefile
3 @@ -129,7 +129,6 @@ ifeq ($(LZMA_XZ_SUPPORT),1)
4 CFLAGS += -DLZMA_SUPPORT
5 MKSQUASHFS_OBJS += lzma_xz_wrapper.o
6 UNSQUASHFS_OBJS += lzma_xz_wrapper.o
7 -LIBS += -llzma
8 COMPRESSORS += lzma
9 endif
10  
11 @@ -137,10 +136,18 @@ ifeq ($(XZ_SUPPORT),1)
12 CFLAGS += -DXZ_SUPPORT
13 MKSQUASHFS_OBJS += xz_wrapper.o
14 UNSQUASHFS_OBJS += xz_wrapper.o
15 -LIBS += -llzma
16 COMPRESSORS += xz
17 endif
18  
19 +ifneq ($(LZMA_XZ_SUPPORT)$(XZ_SUPPORT),)
20 +ifneq ($(LZMA_LIB),)
21 +MKSQUASHFS_OBJS += $(LZMA_LIB)
22 +UNSQUASHFS_OBJS += $(LZMA_LIB)
23 +else
24 +LIBS += -llzma
25 +endif
26 +endif
27 +
28 ifeq ($(LZO_SUPPORT),1)
29 CFLAGS += -DLZO_SUPPORT
30 ifdef LZO_DIR