Cleanups from recent changes

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cc91d1760393801fc9e484778e4636cc885054de..0893ef66aa29a826995729b64c293e24ced2ec6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,12 +64,12 @@ libwim_la_SOURCES =         \
        src/lz_null.c           \
        src/lz_repsearch.c      \
        src/lz_suffix_array_utils.c     \
-       src/lzms-common.c       \
-       src/lzms-compress.c     \
-       src/lzms-decompress.c   \
-       src/lzx-common.c        \
-       src/lzx-compress.c      \
-       src/lzx-decompress.c    \
+       src/lzms_common.c       \
+       src/lzms_compress.c     \
+       src/lzms_decompress.c   \
+       src/lzx_common.c        \
+       src/lzx_compress.c      \
+       src/lzx_decompress.c    \
        src/metadata_resource.c \
        src/mount_image.c       \
        src/pathlist.c          \
@@ -92,12 +92,13 @@ libwim_la_SOURCES =         \
        src/wim.c               \
        src/write.c             \
        src/xml.c               \
-       src/xpress-compress.c   \
-       src/xpress-decompress.c \
+       src/xpress_compress.c   \
+       src/xpress_decompress.c \
        include/wimlib/apply.h          \
        include/wimlib/assert.h         \
        include/wimlib/avl_tree.h       \
        include/wimlib/bitops.h         \
+       include/wimlib/bt_matchfinder.h \
        include/wimlib/callback.h       \
        include/wimlib/capture.h        \
        include/wimlib/case.h           \
@@ -115,6 +116,7 @@ libwim_la_SOURCES =         \
        include/wimlib/error.h          \
        include/wimlib/file_io.h        \
        include/wimlib/glob.h           \
+       include/wimlib/hc_matchfinder.h \
        include/wimlib/header.h         \
        include/wimlib/inode.h          \
        include/wimlib/inode_table.h    \
@@ -127,10 +129,15 @@ libwim_la_SOURCES =               \
        include/wimlib/lz_mf_ops.h      \
        include/wimlib/lz_repsearch.h   \
        include/wimlib/lz_suffix_array_utils.h  \
-       include/wimlib/lzms.h           \
+       include/wimlib/lzms_common.h    \
        include/wimlib/lzms_constants.h \
-       include/wimlib/lzx.h            \
+       include/wimlib/lzx_common.h     \
        include/wimlib/lzx_constants.h  \
+       include/wimlib/matchfinder_avx2.h       \
+       include/wimlib/matchfinder_common.h     \
+       include/wimlib/matchfinder_nonsliding.h \
+       include/wimlib/matchfinder_sliding.h    \
+       include/wimlib/matchfinder_sse2.h       \
        include/wimlib/metadata.h       \
        include/wimlib/pathlist.h       \
        include/wimlib/paths.h          \
@@ -150,7 +157,7 @@ libwim_la_SOURCES =         \
        include/wimlib/wim.h            \
        include/wimlib/write.h          \
        include/wimlib/xml.h            \
-       include/wimlib/xpress.h
+       include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
 libwim_la_SOURCES += src/ntfs-3g_apply.c       \
@@ -173,35 +180,38 @@ libwim_la_SOURCES += src/unix_apply.c             \
                     src/unix_capture.c
 endif
 
-EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
-libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
-EXTRA_DIST += build-aux/nasm_lt.sh
-
-src/sha1-ssse3.lo:src/sha1-ssse3.asm
-       $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
-       $(NASM) $(NAFLAGS) $(NASM_PLATFORM_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_CFLAGS =             \
        $(AM_CFLAGS)            \
+       $(PTHREAD_CFLAGS)       \
        $(LIBXML2_CFLAGS)       \
-       $(LIBFUSE_CFLAGS)       \
        $(LIBNTFS_3G_CFLAGS)    \
+       $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
 libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 18:0:3
 
 libwim_la_LIBADD =             \
+       $(PTHREAD_LIBS)         \
        $(LIBXML2_LIBS)         \
+       $(LTLIBICONV)           \
+       $(LIBNTFS_3G_LIBS)      \
        $(LIBFUSE_LIBS)         \
        $(LIBRT_LIBS)           \
-       $(LIBNTFS_3G_LIBS)      \
-       $(LTLIBICONV)           \
-       $(LIBCRYPTO_LIBS)       \
-       $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)
+       $(LIBCRYPTO_LIBS)
+
+if ENABLE_SSSE3_SHA1
+libwim_la_SOURCES += src/sha1-ssse3.asm
+libwim_la_LIBADD += src/sha1-ssse3.lo
+
+src/sha1-ssse3.lo:src/sha1-ssse3.asm
+       $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+       $(NASM) $(NAFLAGS) $(NASM_PLATFORM_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 $@
+
+EXTRA_DIST += build-aux/nasm_lt.sh
+endif
 
 ##############################################################################
 #                              Programs                                     #