sha1-ssse3.asm: Fix building on Windows

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7591fb623903bc68f34b8a7984abe29d23be0e1c..f9754a104f8dd30dad36e24fadb5995b2b4b7a97 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,13 +43,8 @@ libwim_la_SOURCES =          \
        src/lzms-common.c       \
        src/lzms-compress.c     \
        src/lzms-decompress.c   \
+       src/lz_bt.c             \
        src/lz_hash.c           \
-       src/lz_sarray.c         \
-       src/divsufsort/divsufsort.c             \
-       src/divsufsort/divsufsort.h             \
-       src/divsufsort/divsufsort_private.h     \
-       src/divsufsort/sssort.c \
-       src/divsufsort/trsort.c \
        src/lzx-common.c        \
        src/lzx-compress.c      \
        src/lzx-decompress.c    \
@@ -101,9 +96,8 @@ libwim_la_SOURCES =          \
        include/wimlib/list.h           \
        include/wimlib/lookup_table.h   \
        include/wimlib/lz.h             \
+       include/wimlib/lz_bt.h          \
        include/wimlib/lz_hash.h        \
-       include/wimlib/lz_optimal.h     \
-       include/wimlib/lz_sarray.h      \
        include/wimlib/lzms.h           \
        include/wimlib/lzx.h            \
        include/wimlib/metadata.h       \
@@ -152,12 +146,13 @@ endif
 
 EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
 libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
-STRIP_FPIC = sh $(top_srcdir)/build-aux/strip_fPIC.sh
 
-sha1-ssse3.lo:src/sha1-ssse3.asm
-       $(LIBTOOL) --mode=compile --tag=CC $(STRIP_FPIC) $(NASM) -f elf64 \
-       -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=ssse3_not_found \
-       $<
+src/sha1-ssse3.lo:src/sha1-ssse3.asm
+       $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+       $(NASM) $(NAFLAGS) $(NASM_WINDOWS_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 $@
 
 libwim_la_LIBADD =             \
        $(LIBXML2_LIBS)         \
@@ -242,11 +237,15 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 include_HEADERS = include/wimlib.h
 
 EXTRA_DIST =                                   \
-       build-aux/strip_fPIC.sh                 \
+       build-aux/nasm_lt.sh                    \
        archlinux                               \
        debian                                  \
        rpm                                     \
        examples                                \
+       COPYING                                 \
+       COPYING.GPLv3                           \
+       COPYING.LGPLv3                          \
+       README                                  \
        README.WINDOWS                          \
        tests/common_tests.sh                   \
        tests/tests-common.sh                   \