You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
666 B
31 lines
666 B
14 years ago
|
--- a/squashfs-tools/Makefile
|
||
|
|
+++ b/squashfs-tools/Makefile
|
||
|
|
@@ -129,7 +129,6 @@ ifeq ($(LZMA_XZ_SUPPORT),1)
|
||
|
|
CFLAGS += -DLZMA_SUPPORT
|
||
|
|
MKSQUASHFS_OBJS += lzma_xz_wrapper.o
|
||
|
|
UNSQUASHFS_OBJS += lzma_xz_wrapper.o
|
||
|
|
-LIBS += -llzma
|
||
|
|
COMPRESSORS += lzma
|
||
|
|
endif
|
||
|
|
|
||
|
|
@@ -137,10 +136,18 @@ ifeq ($(XZ_SUPPORT),1)
|
||
|
|
CFLAGS += -DXZ_SUPPORT
|
||
|
|
MKSQUASHFS_OBJS += xz_wrapper.o
|
||
|
|
UNSQUASHFS_OBJS += xz_wrapper.o
|
||
|
|
-LIBS += -llzma
|
||
|
|
COMPRESSORS += xz
|
||
|
|
endif
|
||
|
|
|
||
|
|
+ifneq ($(LZMA_XZ_SUPPORT)$(XZ_SUPPORT),)
|
||
|
|
+ifneq ($(LZMA_LIB),)
|
||
|
|
+MKSQUASHFS_OBJS += $(LZMA_LIB)
|
||
|
|
+UNSQUASHFS_OBJS += $(LZMA_LIB)
|
||
|
|
+else
|
||
|
|
+LIBS += -llzma
|
||
|
|
+endif
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
ifeq ($(LZO_SUPPORT),1)
|
||
|
|
CFLAGS += -DLZO_SUPPORT
|
||
|
|
ifdef LZO_DIR
|