win32-test-imagex-capture_and_apply: eliminate unnecessary %errorlevel% checks
[wimlib] / Makefile.am
index 206a0c2..d6b42d1 100644 (file)
@@ -70,14 +70,16 @@ libwim_la_SOURCES =         \
        src/mount_image.c       \
        src/pathlist.c          \
        src/paths.c             \
+       src/pattern.c           \
        src/progress.c          \
-       src/resource.c          \
        src/reference.c         \
+       src/registry.c          \
+       src/reparse.c           \
+       src/resource.c          \
        src/security.c          \
        src/sha1.c              \
        src/solid.c             \
        src/split.c             \
-       src/reparse.c           \
        src/tagged_items.c      \
        src/template.c          \
        src/textfile.c          \
@@ -85,10 +87,11 @@ libwim_la_SOURCES =         \
        src/update_image.c      \
        src/util.c              \
        src/verify.c            \
-       src/wildcard.c          \
        src/wim.c               \
        src/write.c             \
+       src/x86_cpu_features.c  \
        src/xml.c               \
+       src/xml_windows.c       \
        src/xpress_compress.c   \
        src/xpress_decompress.c \
        include/wimlib/alloca.h         \
@@ -101,7 +104,6 @@ libwim_la_SOURCES =         \
        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       \
@@ -128,13 +130,13 @@ libwim_la_SOURCES =               \
        include/wimlib/lzms_constants.h \
        include/wimlib/lzx_common.h     \
        include/wimlib/lzx_constants.h  \
-       include/wimlib/matchfinder_avx2.h       \
-       include/wimlib/matchfinder_common.h     \
-       include/wimlib/matchfinder_sse2.h       \
        include/wimlib/metadata.h       \
+       include/wimlib/object_id.h      \
        include/wimlib/pathlist.h       \
        include/wimlib/paths.h          \
+       include/wimlib/pattern.h        \
        include/wimlib/progress.h       \
+       include/wimlib/registry.h       \
        include/wimlib/reparse.h        \
        include/wimlib/resource.h       \
        include/wimlib/security.h       \
@@ -147,10 +149,11 @@ libwim_la_SOURCES =               \
        include/wimlib/unaligned.h      \
        include/wimlib/unix_data.h      \
        include/wimlib/util.h           \
-       include/wimlib/wildcard.h       \
        include/wimlib/wim.h            \
        include/wimlib/write.h          \
+       include/wimlib/x86_cpu_features.h       \
        include/wimlib/xml.h            \
+       include/wimlib/xml_windows.h    \
        include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
@@ -160,18 +163,22 @@ libwim_la_SOURCES += src/ntfs-3g_apply.c  \
 endif
 
 if WINDOWS_NATIVE_BUILD
-libwim_la_SOURCES += src/win32_common.c                        \
+libwim_la_SOURCES += src/wimboot.c                     \
+                    src/win32_common.c                 \
                     src/win32_apply.c                  \
                     src/win32_capture.c                \
                     src/win32_replacements.c           \
-                    src/wimboot.c                      \
-                    include/wimlib/win32_common.h      \
-                    include/wimlib/win32.h             \
+                    src/win32_vss.c                    \
                     include/wimlib/wimboot.h           \
+                    include/wimlib/win32.h             \
+                    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
 
 libwim_la_CFLAGS =             \
@@ -182,7 +189,7 @@ libwim_la_CFLAGS =          \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 21:0:6
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 24:0:9
 
 libwim_la_LIBADD =             \
        $(PTHREAD_LIBS)         \
@@ -191,14 +198,15 @@ libwim_la_LIBADD =                \
        $(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  \
@@ -318,7 +326,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      \