Remove "brute force" match-finding algorithm

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b3abad47683fe4c451d47350d34071c61b380505..beaedc4bc6de29a073c9c839e37e3d3baa90c368 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 15:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 16:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -29,6 +29,7 @@ libwim_la_SOURCES =           \
        src/decompress_common.c \
        src/delete_image.c      \
        src/dentry.c            \
+       src/divsufsort.c        \
        src/encoding.c          \
        src/export_image.c      \
        src/extract.c           \
@@ -40,11 +41,16 @@ libwim_la_SOURCES =         \
        src/iterate_dir.c       \
        src/join.c              \
        src/lookup_table.c      \
+       src/lz_binary_trees.c   \
+       src/lz_hash_chains.c    \
+       src/lz_lcp_interval_tree.c      \
+       src/lz_linked_suffix_array.c    \
+       src/lz_mf.c             \
+       src/lz_null.c           \
+       src/lz_suffix_array_utils.c     \
        src/lzms-common.c       \
        src/lzms-compress.c     \
        src/lzms-decompress.c   \
-       src/lz_bt.c             \
-       src/lz_hash.c           \
        src/lzx-common.c        \
        src/lzx-compress.c      \
        src/lzx-decompress.c    \
@@ -84,6 +90,7 @@ libwim_la_SOURCES =           \
        include/wimlib/decompressor_ops.h       \
        include/wimlib/decompress_common.h      \
        include/wimlib/dentry.h         \
+       include/wimlib/divsufsort.h     \
        include/wimlib/encoding.h       \
        include/wimlib/endianness.h     \
        include/wimlib/error.h          \
@@ -95,9 +102,9 @@ libwim_la_SOURCES =          \
        include/wimlib/integrity.h      \
        include/wimlib/list.h           \
        include/wimlib/lookup_table.h   \
-       include/wimlib/lz.h             \
-       include/wimlib/lz_bt.h          \
-       include/wimlib/lz_hash.h        \
+       include/wimlib/lz_mf.h          \
+       include/wimlib/lz_mf_ops.h      \
+       include/wimlib/lz_suffix_array_utils.h  \
        include/wimlib/lzms.h           \
        include/wimlib/lzx.h            \
        include/wimlib/metadata.h       \
@@ -146,12 +153,13 @@ endif
 
 EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
 libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
-STRIP_FPIC = sh $(top_srcdir)/build-aux/strip_fPIC.sh
 
-sha1-ssse3.lo:src/sha1-ssse3.asm
-       $(LIBTOOL) --mode=compile --tag=CC $(STRIP_FPIC) $(NASM) -f elf64 \
-       -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=ssse3_not_found \
-       $<
+src/sha1-ssse3.lo:src/sha1-ssse3.asm
+       $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+       $(NASM) $(NAFLAGS) $(NASM_WINDOWS_FLAGS)                            \
+       -DINTEL_SHA1_UPDATE_FUNCNAME=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_ssse3       \
+       -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_default  \
+       $< -o $@
 
 libwim_la_LIBADD =             \
        $(LIBXML2_LIBS)         \
@@ -236,11 +244,15 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 include_HEADERS = include/wimlib.h
 
 EXTRA_DIST =                                   \
-       build-aux/strip_fPIC.sh                 \
+       build-aux/nasm_lt.sh                    \
        archlinux                               \
        debian                                  \
        rpm                                     \
        examples                                \
+       COPYING                                 \
+       COPYING.GPLv3                           \
+       COPYING.LGPLv3                          \
+       README                                  \
        README.WINDOWS                          \
        tests/common_tests.sh                   \
        tests/tests-common.sh                   \