X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=92c09feb8ac259fe2ec164e5fee94f61f75d3ac2;hb=HEAD;hp=fd2ec0831ec2ce1ba661b39ad96cd82bef662d4d;hpb=ad1e3889667e6d98c90c031b63a1e899bb0010d2;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index fd2ec083..4d6576a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,10 @@ AM_CFLAGS	= -std=gnu99 $(PLATFORM_CFLAGS) -fno-common	\
 
 AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST	= README README.WINDOWS				\
+EXTRA_DIST	= README.md README.WINDOWS.md NEWS.md		\
 		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
-		  examples
+		  examples					\
+		  tools/get-version-number.sh tools/windows-build.sh
 
 ##############################################################################
 #				Library					     #
@@ -83,6 +84,7 @@ 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		\
@@ -91,6 +93,7 @@ libwim_la_SOURCES =		\
 	src/write.c		\
 	src/xml.c		\
 	src/xml_windows.c	\
+	src/xmlproc.c		\
 	src/xpress_compress.c	\
 	src/xpress_decompress.c \
 	include/wimlib/alloca.h		\
@@ -144,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	\
@@ -154,6 +158,7 @@ libwim_la_SOURCES =		\
 	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
@@ -184,44 +189,27 @@ endif
 if ENABLE_TEST_SUPPORT
 libwim_la_SOURCES += src/test_support.c		\
 		     include/wimlib/test_support.h
+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)
-
-# This is to avoid deprecation warnings for OpenSSL's SHA1_* functions.
-# Their replacement (EVP) is harder to use and less performant...
-libwim_la_CFLAGS += -Wno-deprecated-declarations
+	$(LIBFUSE_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 36:0:21
+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				     #
 ##############################################################################