win32-test-imagex-capture_and_apply: eliminate unnecessary %errorlevel% checks

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2987b1004ec2b9aa3a387f3bc28f77b029d31fb5..d6b42d15c98574ac56d9707decbcfeade53592aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,6 +131,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        \
@@ -173,9 +174,11 @@ 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
 
 libwim_la_CFLAGS =             \
@@ -195,7 +198,8 @@ 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
@@ -322,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      \