Use native Windows threads on Windows

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5fa5448d7c9e830a564c85a07c5e0d592dc8946c..bb801a523856e7604ce3b89df751a356fce801f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ libwim_la_SOURCES =           \
        src/compress_common.c   \
        src/compress_parallel.c \
        src/compress_serial.c   \
+       src/cpu_features.c      \
        src/decompress.c        \
        src/decompress_common.c \
        src/delete_image.c      \
@@ -82,13 +83,13 @@ libwim_la_SOURCES =         \
        src/tagged_items.c      \
        src/template.c          \
        src/textfile.c          \
+       src/threads.c           \
        src/timestamp.c         \
        src/update_image.c      \
        src/util.c              \
        src/verify.c            \
        src/wim.c               \
        src/write.c             \
-       src/x86_cpu_features.c  \
        src/xml.c               \
        src/xml_windows.c       \
        src/xpress_compress.c   \
@@ -105,6 +106,7 @@ libwim_la_SOURCES =         \
        include/wimlib/compressor_ops.h \
        include/wimlib/compress_common.h        \
        include/wimlib/chunk_compressor.h       \
+       include/wimlib/cpu_features.h   \
        include/wimlib/decompressor_ops.h       \
        include/wimlib/decompress_common.h      \
        include/wimlib/dentry.h         \
@@ -143,6 +145,7 @@ libwim_la_SOURCES =         \
        include/wimlib/solid.h          \
        include/wimlib/tagged_items.h   \
        include/wimlib/textfile.h       \
+       include/wimlib/threads.h        \
        include/wimlib/timestamp.h      \
        include/wimlib/types.h          \
        include/wimlib/unaligned.h      \
@@ -150,7 +153,6 @@ libwim_la_SOURCES =         \
        include/wimlib/util.h           \
        include/wimlib/wim.h            \
        include/wimlib/write.h          \
-       include/wimlib/x86_cpu_features.h       \
        include/wimlib/xattr.h          \
        include/wimlib/xml.h            \
        include/wimlib/xml_windows.h    \
@@ -191,10 +193,9 @@ libwim_la_CFLAGS =         \
        $(PTHREAD_CFLAGS)       \
        $(LIBXML2_CFLAGS)       \
        $(LIBNTFS_3G_CFLAGS)    \
-       $(LIBFUSE_CFLAGS)       \
-       $(LIBCRYPTO_CFLAGS)
+       $(LIBFUSE_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)         \
@@ -202,22 +203,8 @@ libwim_la_LIBADD =         \
        $(LIBNTFS_3G_LIBS)      \
        $(LIBFUSE_LIBS)         \
        $(LIBRT_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 $(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  \
-       $< -o $@
-endif
-EXTRA_DIST += build-aux/nasm_lt.sh
-
 ##############################################################################
 #                              Programs                                     #
 ##############################################################################