X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=d6b42d15c98574ac56d9707decbcfeade53592aa;hb=dd836fd8710e130711935003e386de6755eb84ba;hp=26bf66061a095c33ac952a0ab553f3690bdc2028;hpb=fcafdfda28fd0e84e5f98fa2ae2dcf091e1ccc39;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 26bf6606..d6b42d15 100644
--- 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,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  \
@@ -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	\