matchfinder_common: sync with libdeflate

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6754144bd03f69f2d4a5e00f536afba999265eb2..7e43e3bc196756b7c87578e904629413ab8d4086 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,9 @@ AM_CFLAGS    = -std=gnu99 $(PLATFORM_CFLAGS) -fno-common     \
 
 AM_LDFLAGS     = $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST     = README README.WINDOWS                                 \
-                 COPYING COPYING.GPLv3 COPYING.LGPLv3 COPYING.CC0      \
-                 examples                                              \
-                 archlinux debian rpm
+EXTRA_DIST     = README README.WINDOWS                         \
+                 COPYING COPYING.GPLv3 COPYING.LGPLv3          \
+                 examples
 
 ##############################################################################
 #                              Library                                      #
@@ -123,12 +122,11 @@ libwim_la_SOURCES =               \
        include/wimlib/integrity.h      \
        include/wimlib/lcpit_matchfinder.h      \
        include/wimlib/list.h           \
-       include/wimlib/lz_extend.h      \
-       include/wimlib/lz_hash.h        \
        include/wimlib/lzms_common.h    \
        include/wimlib/lzms_constants.h \
        include/wimlib/lzx_common.h     \
        include/wimlib/lzx_constants.h  \
+       include/wimlib/matchfinder_common.h     \
        include/wimlib/metadata.h       \
        include/wimlib/object_id.h      \
        include/wimlib/pathlist.h       \
@@ -143,6 +141,7 @@ libwim_la_SOURCES =         \
        include/wimlib/security_descriptor.h    \
        include/wimlib/sha1.h           \
        include/wimlib/solid.h          \
+       include/wimlib/tagged_items.h   \
        include/wimlib/textfile.h       \
        include/wimlib/timestamp.h      \
        include/wimlib/types.h          \
@@ -152,6 +151,7 @@ libwim_la_SOURCES =         \
        include/wimlib/wim.h            \
        include/wimlib/write.h          \
        include/wimlib/x86_cpu_features.h       \
+       include/wimlib/xattr.h          \
        include/wimlib/xml.h            \
        include/wimlib/xml_windows.h    \
        include/wimlib/xpress_constants.h
@@ -199,7 +199,7 @@ libwim_la_CFLAGS =          \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:11
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 35:0:20
 
 libwim_la_LIBADD =             \
        $(PTHREAD_LIBS)         \
@@ -220,9 +220,8 @@ src/sha1-ssse3.lo:src/sha1-ssse3.asm
        -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
+EXTRA_DIST += build-aux/nasm_lt.sh
 
 ##############################################################################
 #                              Programs                                     #
@@ -279,7 +278,7 @@ install-exec-hook:
 install-data-hook:
        for cmd in $(wimlib_imagex_cmds); do                            \
                cd $(DESTDIR)$(mandir)/man1 &&                          \
-                       ln -sf wimlib-imagex-$${cmd}.1 wim$${cmd}.1;    \
+                       ln -sf wim$${cmd}.1 wimlib-imagex-$${cmd}.1;    \
        done
 
 uninstall-hook:
@@ -292,24 +291,24 @@ uninstall-hook:
 #                              Documentation                                #
 ##############################################################################
 
-man1_MANS =                                    \
-       doc/man1/wimlib-imagex.1                \
-       doc/man1/wimlib-imagex-append.1         \
-       doc/man1/wimlib-imagex-apply.1          \
-       doc/man1/wimlib-imagex-capture.1        \
-       doc/man1/wimlib-imagex-delete.1         \
-       doc/man1/wimlib-imagex-dir.1            \
-       doc/man1/wimlib-imagex-export.1         \
-       doc/man1/wimlib-imagex-extract.1        \
-       doc/man1/wimlib-imagex-info.1           \
-       doc/man1/wimlib-imagex-join.1           \
-       doc/man1/wimlib-imagex-mount.1          \
-       doc/man1/wimlib-imagex-mountrw.1        \
-       doc/man1/wimlib-imagex-optimize.1       \
-       doc/man1/wimlib-imagex-split.1          \
-       doc/man1/wimlib-imagex-unmount.1        \
-       doc/man1/wimlib-imagex-update.1         \
-       doc/man1/wimlib-imagex-verify.1         \
+man1_MANS =                            \
+       doc/man1/wimlib-imagex.1        \
+       doc/man1/wimappend.1            \
+       doc/man1/wimapply.1             \
+       doc/man1/wimcapture.1           \
+       doc/man1/wimdelete.1            \
+       doc/man1/wimdir.1               \
+       doc/man1/wimexport.1            \
+       doc/man1/wimextract.1           \
+       doc/man1/wiminfo.1              \
+       doc/man1/wimjoin.1              \
+       doc/man1/wimmount.1             \
+       doc/man1/wimmountrw.1           \
+       doc/man1/wimoptimize.1          \
+       doc/man1/wimsplit.1             \
+       doc/man1/wimunmount.1           \
+       doc/man1/wimupdate.1            \
+       doc/man1/wimverify.1            \
        doc/man1/mkwinpeimg.1
 
 EXTRA_DIST += $(man1_MANS)
@@ -335,11 +334,13 @@ endif
 
 EXTRA_DIST +=                                  \
        tests/common_tests.sh                   \
+       tests/exclusionlists                    \
        tests/test_utils.sh                     \
        tests/security_descriptor_1.base64      \
        tests/security_descriptor_1.bin         \
        tests/security_descriptor_2.base64      \
-       tests/security_descriptor_2.bin
+       tests/security_descriptor_2.bin         \
+       tests/wims
 
 if WINDOWS_NATIVE_BUILD
 # Tests are run manually for Windows builds.