X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=dc653f7ac1d2aa3ea0c0fca7fa8ea552425bf052;hb=HEAD;hp=92c09feb8ac259fe2ec164e5fee94f61f75d3ac2;hpb=47a26907e204b6ed6924937599df85cbf10027d8;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 92c09feb..4d6576a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,10 @@ AM_CFLAGS	= -std=gnu99 $(PLATFORM_CFLAGS) -fno-common	\
 
 AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST	= README README.WINDOWS					\
-		  COPYING COPYING.GPLv3	COPYING.LGPLv3 COPYING.CC0	\
-		  examples						\
-		  debian rpm
+EXTRA_DIST	= README.md README.WINDOWS.md NEWS.md		\
+		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
+		  examples					\
+		  tools/get-version-number.sh tools/windows-build.sh
 
 ##############################################################################
 #				Library					     #
@@ -41,6 +41,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	\
@@ -83,15 +84,16 @@ 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/xmlproc.c		\
 	src/xpress_compress.c	\
 	src/xpress_decompress.c \
 	include/wimlib/alloca.h		\
@@ -106,6 +108,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		\
@@ -123,12 +126,11 @@ libwim_la_SOURCES =		\
 	include/wimlib/integrity.h	\
 	include/wimlib/lcpit_matchfinder.h	\
 	include/wimlib/list.h		\
-	include/wimlib/lz_extend.h	\
-	include/wimlib/lz_hash.h	\
 	include/wimlib/lzms_common.h	\
 	include/wimlib/lzms_constants.h	\
 	include/wimlib/lzx_common.h	\
 	include/wimlib/lzx_constants.h	\
+	include/wimlib/matchfinder_common.h	\
 	include/wimlib/metadata.h	\
 	include/wimlib/object_id.h	\
 	include/wimlib/pathlist.h	\
@@ -145,6 +147,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	\
@@ -152,10 +155,10 @@ 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	\
+	include/wimlib/xmlproc.h	\
 	include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
@@ -176,7 +179,7 @@ libwim_la_SOURCES += src/wimboot.c			\
 		     include/wimlib/win32_common.h	\
 		     include/wimlib/win32_vss.h		\
 		     include/wimlib/wof.h
-PLATFORM_LIBS = -lmsvcrt -lntdll
+PLATFORM_LIBS = -lntdll
 else
 libwim_la_SOURCES += src/unix_apply.c		\
 		     src/unix_capture.c
@@ -186,45 +189,27 @@ endif
 if ENABLE_TEST_SUPPORT
 libwim_la_SOURCES += src/test_support.c		\
 		     include/wimlib/test_support.h
-if WINDOWS_NATIVE_BUILD
-# Workaround for "multiple definition" error when math symbols are present in
-# both libmsvcrt.a and ntdll.a
-AM_LDFLAGS += -Wl,--allow-multiple-definition
+if !WINDOWS_NATIVE_BUILD
+PLATFORM_LIBS += -lm
 endif
 endif
 
 libwim_la_CFLAGS =		\
+	-DBUILDING_WIMLIB	\
 	$(AM_CFLAGS)		\
 	$(PTHREAD_CFLAGS)	\
-	$(LIBXML2_CFLAGS)	\
 	$(LIBNTFS_3G_CFLAGS)	\
-	$(LIBFUSE_CFLAGS)	\
-	$(LIBCRYPTO_CFLAGS)
+	$(LIBFUSE_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 29:0:14
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 41:0:26
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\
-	$(LIBXML2_LIBS)		\
 	$(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				     #
 ##############################################################################
@@ -341,7 +326,8 @@ EXTRA_DIST +=					\
 	tests/security_descriptor_1.base64	\
 	tests/security_descriptor_1.bin		\
 	tests/security_descriptor_2.base64	\
-	tests/security_descriptor_2.bin
+	tests/security_descriptor_2.bin		\
+	tests/wims
 
 if WINDOWS_NATIVE_BUILD
 # Tests are run manually for Windows builds.