v1.13.6

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 84420a3255742c2f176849f86d06e18d4b30f597..d785bf2eee40a1978a6ee972ae5094b61d4bfdbc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ AM_CFLAGS     = -std=gnu99 $(PLATFORM_CFLAGS) -fno-common     \
 
 AM_LDFLAGS     = $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST     = README README.WINDOWS                                 \
-                 COPYING COPYING.GPLv3 COPYING.LGPLv3 COPYING.CC0      \
+EXTRA_DIST     = README README.WINDOWS                         \
+                 COPYING COPYING.GPLv3 COPYING.LGPLv3          \
                  examples
 
 ##############################################################################
@@ -122,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       \
@@ -175,7 +174,7 @@ libwim_la_SOURCES += src/wimboot.c                  \
                     include/wimlib/win32_common.h      \
                     include/wimlib/win32_vss.h         \
                     include/wimlib/wof.h
-PLATFORM_LIBS = -lmsvcrt -lntdll
+PLATFORM_LIBS = -lntdll
 else
 libwim_la_SOURCES += src/unix_apply.c          \
                     src/unix_capture.c
@@ -185,11 +184,6 @@ endif
 if ENABLE_TEST_SUPPORT
 libwim_la_SOURCES += src/test_support.c                \
                     include/wimlib/test_support.h
-if WINDOWS_NATIVE_BUILD
-# Workaround for "multiple definition" error when math symbols are present in
-# both libmsvcrt.a and ntdll.a
-AM_LDFLAGS += -Wl,--allow-multiple-definition
-endif
 endif
 
 libwim_la_CFLAGS =             \
@@ -200,7 +194,7 @@ libwim_la_CFLAGS =          \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 35:0:20
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 36:0:21
 
 libwim_la_LIBADD =             \
        $(PTHREAD_LIBS)         \