wimapply.1: fix documentation for valid Windows filenames

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 306215214c53280bec8fe5a0728a6518a5c5665e..6754144bd03f69f2d4a5e00f536afba999265eb2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@ AM_CFLAGS     = -std=gnu99 $(PLATFORM_CFLAGS) -fno-common     \
 
 AM_LDFLAGS     = $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST     = README README.WINDOWS                         \
-                 COPYING COPYING.GPLv3 COPYING.LGPLv3          \
-                 examples                                      \
+EXTRA_DIST     = README README.WINDOWS                                 \
+                 COPYING COPYING.GPLv3 COPYING.LGPLv3 COPYING.CC0      \
+                 examples                                              \
                  archlinux debian rpm
 
 ##############################################################################
@@ -37,7 +37,6 @@ libwim_la_SOURCES =           \
        src/add_image.c         \
        src/avl_tree.c          \
        src/blob_table.c        \
-       src/capture_common.c    \
        src/compress.c          \
        src/compress_common.c   \
        src/compress_parallel.c \
@@ -76,6 +75,7 @@ libwim_la_SOURCES =           \
        src/registry.c          \
        src/reparse.c           \
        src/resource.c          \
+       src/scan.c              \
        src/security.c          \
        src/sha1.c              \
        src/solid.c             \
@@ -101,10 +101,8 @@ libwim_la_SOURCES =                \
        include/wimlib/bitops.h         \
        include/wimlib/blob_table.h     \
        include/wimlib/bt_matchfinder.h \
-       include/wimlib/capture.h        \
        include/wimlib/case.h           \
        include/wimlib/compiler.h       \
-       include/wimlib/compiler-gcc.h   \
        include/wimlib/compressor_ops.h \
        include/wimlib/compress_common.h        \
        include/wimlib/chunk_compressor.h       \
@@ -132,6 +130,7 @@ libwim_la_SOURCES =         \
        include/wimlib/lzx_common.h     \
        include/wimlib/lzx_constants.h  \
        include/wimlib/metadata.h       \
+       include/wimlib/object_id.h      \
        include/wimlib/pathlist.h       \
        include/wimlib/paths.h          \
        include/wimlib/pattern.h        \
@@ -139,6 +138,7 @@ libwim_la_SOURCES =         \
        include/wimlib/registry.h       \
        include/wimlib/reparse.h        \
        include/wimlib/resource.h       \
+       include/wimlib/scan.h           \
        include/wimlib/security.h       \
        include/wimlib/security_descriptor.h    \
        include/wimlib/sha1.h           \
@@ -174,9 +174,21 @@ libwim_la_SOURCES += src/wimboot.c                 \
                     include/wimlib/win32_common.h      \
                     include/wimlib/win32_vss.h         \
                     include/wimlib/wof.h
+PLATFORM_LIBS = -lmsvcrt -lntdll
 else
 libwim_la_SOURCES += src/unix_apply.c          \
                     src/unix_capture.c
+PLATFORM_LIBS =
+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 =             \
@@ -187,23 +199,23 @@ libwim_la_CFLAGS =                \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 23:0:8
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:11
 
 libwim_la_LIBADD =             \
        $(PTHREAD_LIBS)         \
        $(LIBXML2_LIBS)         \
-       $(LTLIBICONV)           \
        $(LIBNTFS_3G_LIBS)      \
        $(LIBFUSE_LIBS)         \
        $(LIBRT_LIBS)           \
-       $(LIBCRYPTO_LIBS)
+       $(LIBCRYPTO_LIBS)       \
+       $(PLATFORM_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 \
+       $(LIBTOOL) --mode=compile $(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  \
@@ -323,7 +335,7 @@ endif
 
 EXTRA_DIST +=                                  \
        tests/common_tests.sh                   \
-       tests/tests-common.sh                   \
+       tests/test_utils.sh                     \
        tests/security_descriptor_1.base64      \
        tests/security_descriptor_1.bin         \
        tests/security_descriptor_2.base64      \
@@ -336,4 +348,9 @@ else
 TESTS = $(dist_check_SCRIPTS)
 endif
 
+# Extra test programs (not run by 'make check')
+EXTRA_PROGRAMS = tests/wlfuzz
+tests_wlfuzz_SOURCES = tests/wlfuzz.c
+tests_wlfuzz_LDADD = $(top_builddir)/libwim.la
+
 ##############################################################################