X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=2e1298b6bf8f3f9e94fef248cc4afff118d69be3;hb=93ff837938b51373bc60153ef60409f6c1f795c8;hp=7591fb623903bc68f34b8a7984abe29d23be0e1c;hpb=27b30056e4520e9b5b9d0846f438311746345f83;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 7591fb62..2e1298b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 15:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 16:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -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			\