X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=ed7ac51126511a11cc610e3d52d93bae744c2adf;hb=30de026bb982eb3955acb17703b53fe72eb23751;hp=7591fb623903bc68f34b8a7984abe29d23be0e1c;hpb=27b30056e4520e9b5b9d0846f438311746345f83;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 7591fb62..ed7ac511 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS	= -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \
 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-AM_CFLAGS	= -std=gnu99 -Wmissing-prototypes -Wstrict-prototypes	\
+AM_CFLAGS	= -std=c99 -Wmissing-prototypes -Wstrict-prototypes	\
 		  -Werror-implicit-function-declaration			\
 		  -fno-common -Wundef -Wno-pointer-sign
 
@@ -15,7 +15,7 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 15:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 18:0:3 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -29,27 +29,31 @@ libwim_la_SOURCES =		\
 	src/decompress_common.c	\
 	src/delete_image.c	\
 	src/dentry.c		\
+	src/divsufsort.c	\
 	src/encoding.c		\
+	src/error.c		\
 	src/export_image.c	\
 	src/extract.c		\
 	src/file_io.c		\
 	src/header.c		\
 	src/inode.c		\
 	src/inode_fixup.c	\
+	src/inode_table.c	\
 	src/integrity.c		\
 	src/iterate_dir.c	\
 	src/join.c		\
 	src/lookup_table.c	\
+	src/lz_binary_trees.c	\
+	src/lz_hash_chains.c	\
+	src/lz_lcp_interval_tree.c	\
+	src/lz_linked_suffix_array.c	\
+	src/lz_mf.c		\
+	src/lz_null.c		\
+	src/lz_repsearch.c	\
+	src/lz_suffix_array_utils.c	\
 	src/lzms-common.c	\
 	src/lzms-compress.c	\
 	src/lzms-decompress.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	\
@@ -57,6 +61,7 @@ libwim_la_SOURCES =		\
 	src/mount_image.c	\
 	src/pathlist.c		\
 	src/paths.c		\
+	src/progress.c		\
 	src/resource.c		\
 	src/reference.c		\
 	src/security.c		\
@@ -79,16 +84,19 @@ libwim_la_SOURCES =		\
 	include/wimlib/apply.h		\
 	include/wimlib/assert.h		\
 	include/wimlib/avl_tree.h	\
+	include/wimlib/bitops.h		\
 	include/wimlib/callback.h	\
 	include/wimlib/capture.h	\
 	include/wimlib/case.h		\
 	include/wimlib/compiler.h	\
+	include/wimlib/compiler-gcc.h	\
 	include/wimlib/compressor_ops.h	\
 	include/wimlib/compress_common.h	\
 	include/wimlib/chunk_compressor.h	\
 	include/wimlib/decompressor_ops.h	\
 	include/wimlib/decompress_common.h	\
 	include/wimlib/dentry.h		\
+	include/wimlib/divsufsort.h	\
 	include/wimlib/encoding.h	\
 	include/wimlib/endianness.h	\
 	include/wimlib/error.h		\
@@ -100,12 +108,16 @@ libwim_la_SOURCES =		\
 	include/wimlib/integrity.h	\
 	include/wimlib/list.h		\
 	include/wimlib/lookup_table.h	\
-	include/wimlib/lz.h		\
-	include/wimlib/lz_hash.h	\
-	include/wimlib/lz_optimal.h	\
-	include/wimlib/lz_sarray.h	\
+	include/wimlib/lz_extend.h	\
+	include/wimlib/lz_hash3.h	\
+	include/wimlib/lz_mf.h		\
+	include/wimlib/lz_mf_ops.h	\
+	include/wimlib/lz_repsearch.h	\
+	include/wimlib/lz_suffix_array_utils.h	\
 	include/wimlib/lzms.h		\
+	include/wimlib/lzms_constants.h	\
 	include/wimlib/lzx.h		\
+	include/wimlib/lzx_constants.h	\
 	include/wimlib/metadata.h	\
 	include/wimlib/pathlist.h	\
 	include/wimlib/paths.h		\
@@ -118,9 +130,9 @@ libwim_la_SOURCES =		\
 	include/wimlib/textfile.h	\
 	include/wimlib/timestamp.h	\
 	include/wimlib/types.h		\
+	include/wimlib/unaligned.h	\
 	include/wimlib/unix_data.h	\
 	include/wimlib/util.h		\
-	include/wimlib/version.h	\
 	include/wimlib/wildcard.h	\
 	include/wimlib/wim.h		\
 	include/wimlib/write.h		\
@@ -152,12 +164,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)		\
@@ -167,8 +180,7 @@ libwim_la_LIBADD =		\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LIBS)	\
 	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)	\
-	$(WINDOWS_LDADD)
+	$(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
@@ -207,7 +219,8 @@ imagex_cmds =	append	\
 		optimize\
 		split	\
 		unmount	\
-		update
+		update	\
+		verify
 
 install-exec-hook:
 	if [ "@IMAGEX_PROGNAME@" != imagex ]; then			    \
@@ -242,11 +255,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			\
@@ -277,6 +294,7 @@ wimlib_manpages =				\
 	doc/man1/@IMAGEX_PROGNAME@-split.1		\
 	doc/man1/@IMAGEX_PROGNAME@-unmount.1		\
 	doc/man1/@IMAGEX_PROGNAME@-update.1		\
+	doc/man1/@IMAGEX_PROGNAME@-verify.1		\
 	doc/man1/mkwinpeimg.1
 
 man1_MANS = $(wimlib_manpages)