X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=2e1298b6bf8f3f9e94fef248cc4afff118d69be3;hp=23ffcd9c1f3dc362b21823699d5a266c3909ee4e;hb=93ff837938b51373bc60153ef60409f6c1f795c8;hpb=e20f8057569b65f75994e8d88c7a0be80a749888

diff --git a/Makefile.am b/Makefile.am
index 23ffcd9c..2e1298b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,13 +15,12 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 14:0:5 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 16:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
 	src/avl_tree.c		\
 	src/capture_common.c	\
-	src/compat.c		\
 	src/compress.c		\
 	src/compress_common.c	\
 	src/compress_parallel.c	\
@@ -44,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	\
@@ -64,7 +58,9 @@ libwim_la_SOURCES =		\
 	src/sha1.c		\
 	src/split.c		\
 	src/reparse.c		\
+	src/tagged_items.c	\
 	src/template.c		\
+	src/textfile.c		\
 	src/timestamp.c		\
 	src/update_image.c	\
 	src/util.c		\
@@ -100,19 +96,20 @@ 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	\
 	include/wimlib/pathlist.h	\
 	include/wimlib/paths.h		\
+	include/wimlib/progress.h	\
 	include/wimlib/reparse.h	\
 	include/wimlib/resource.h	\
 	include/wimlib/security.h	\
 	include/wimlib/security_descriptor.h	\
 	include/wimlib/sha1.h		\
+	include/wimlib/textfile.h	\
 	include/wimlib/timestamp.h	\
 	include/wimlib/types.h		\
 	include/wimlib/unix_data.h	\
@@ -149,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)		\
@@ -239,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			\
@@ -258,23 +260,23 @@ pkgconfig_DATA	= wimlib.pc
 $(pkgconfig_DATA): config.status
 
 wimlib_manpages =				\
-	doc/@IMAGEX_PROGNAME@.1			\
-	doc/@IMAGEX_PROGNAME@-append.1		\
-	doc/@IMAGEX_PROGNAME@-apply.1		\
-	doc/@IMAGEX_PROGNAME@-capture.1		\
-	doc/@IMAGEX_PROGNAME@-delete.1		\
-	doc/@IMAGEX_PROGNAME@-dir.1		\
-	doc/@IMAGEX_PROGNAME@-export.1		\
-	doc/@IMAGEX_PROGNAME@-extract.1		\
-	doc/@IMAGEX_PROGNAME@-info.1		\
-	doc/@IMAGEX_PROGNAME@-join.1		\
-	doc/@IMAGEX_PROGNAME@-mount.1		\
-	doc/@IMAGEX_PROGNAME@-mountrw.1		\
-	doc/@IMAGEX_PROGNAME@-optimize.1	\
-	doc/@IMAGEX_PROGNAME@-split.1		\
-	doc/@IMAGEX_PROGNAME@-unmount.1		\
-	doc/@IMAGEX_PROGNAME@-update.1		\
-	doc/mkwinpeimg.1
+	doc/man1/@IMAGEX_PROGNAME@.1			\
+	doc/man1/@IMAGEX_PROGNAME@-append.1		\
+	doc/man1/@IMAGEX_PROGNAME@-apply.1		\
+	doc/man1/@IMAGEX_PROGNAME@-capture.1		\
+	doc/man1/@IMAGEX_PROGNAME@-delete.1		\
+	doc/man1/@IMAGEX_PROGNAME@-dir.1		\
+	doc/man1/@IMAGEX_PROGNAME@-export.1		\
+	doc/man1/@IMAGEX_PROGNAME@-extract.1		\
+	doc/man1/@IMAGEX_PROGNAME@-info.1		\
+	doc/man1/@IMAGEX_PROGNAME@-join.1		\
+	doc/man1/@IMAGEX_PROGNAME@-mount.1		\
+	doc/man1/@IMAGEX_PROGNAME@-mountrw.1		\
+	doc/man1/@IMAGEX_PROGNAME@-optimize.1	\
+	doc/man1/@IMAGEX_PROGNAME@-split.1		\
+	doc/man1/@IMAGEX_PROGNAME@-unmount.1		\
+	doc/man1/@IMAGEX_PROGNAME@-update.1		\
+	doc/man1/mkwinpeimg.1
 
 man1_MANS = $(wimlib_manpages)
 DISTCLEANFILES = $(wimlib_manpages)