X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=3615d49f653f9c4bcdbefbd7a4c7cc31b89a04ee;hp=647521e0eb3b4f3c4abde8c5ea75ebd29c4d335e;hb=37d9c3935130128901f6eee8d7531d8ae4b1bca6;hpb=d5a64bb4299105c93b4e9a95e97b579c6f9254af

diff --git a/Makefile.am b/Makefile.am
index 647521e0..3615d49f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,6 @@ libwim_la_SOURCES =		\
 	src/add_image.c		\
 	src/avl_tree.c		\
 	src/blob_table.c	\
-	src/capture_common.c	\
 	src/compress.c		\
 	src/compress_common.c	\
 	src/compress_parallel.c	\
@@ -72,13 +71,15 @@ libwim_la_SOURCES =		\
 	src/paths.c		\
 	src/pattern.c		\
 	src/progress.c		\
-	src/resource.c		\
 	src/reference.c		\
+	src/registry.c		\
+	src/reparse.c		\
+	src/resource.c		\
+	src/scan.c		\
 	src/security.c		\
 	src/sha1.c		\
 	src/solid.c		\
 	src/split.c		\
-	src/reparse.c		\
 	src/tagged_items.c	\
 	src/template.c		\
 	src/textfile.c		\
@@ -88,7 +89,9 @@ libwim_la_SOURCES =		\
 	src/verify.c		\
 	src/wim.c		\
 	src/write.c		\
+	src/x86_cpu_features.c	\
 	src/xml.c		\
+	src/xml_windows.c	\
 	src/xpress_compress.c	\
 	src/xpress_decompress.c \
 	include/wimlib/alloca.h		\
@@ -98,10 +101,8 @@ libwim_la_SOURCES =		\
 	include/wimlib/bitops.h		\
 	include/wimlib/blob_table.h	\
 	include/wimlib/bt_matchfinder.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	\
@@ -128,16 +129,16 @@ libwim_la_SOURCES =		\
 	include/wimlib/lzms_constants.h	\
 	include/wimlib/lzx_common.h	\
 	include/wimlib/lzx_constants.h	\
-	include/wimlib/matchfinder_avx2.h	\
-	include/wimlib/matchfinder_common.h	\
-	include/wimlib/matchfinder_sse2.h	\
 	include/wimlib/metadata.h	\
+	include/wimlib/object_id.h	\
 	include/wimlib/pathlist.h	\
 	include/wimlib/paths.h		\
 	include/wimlib/pattern.h	\
 	include/wimlib/progress.h	\
+	include/wimlib/registry.h	\
 	include/wimlib/reparse.h	\
 	include/wimlib/resource.h	\
+	include/wimlib/scan.h		\
 	include/wimlib/security.h	\
 	include/wimlib/security_descriptor.h	\
 	include/wimlib/sha1.h		\
@@ -150,7 +151,9 @@ libwim_la_SOURCES =		\
 	include/wimlib/util.h		\
 	include/wimlib/wim.h		\
 	include/wimlib/write.h		\
+	include/wimlib/x86_cpu_features.h	\
 	include/wimlib/xml.h		\
+	include/wimlib/xml_windows.h	\
 	include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
@@ -160,18 +163,32 @@ libwim_la_SOURCES += src/ntfs-3g_apply.c	\
 endif
 
 if WINDOWS_NATIVE_BUILD
-libwim_la_SOURCES += src/win32_common.c			\
+libwim_la_SOURCES += src/wimboot.c			\
+		     src/win32_common.c			\
 		     src/win32_apply.c			\
 		     src/win32_capture.c		\
 		     src/win32_replacements.c		\
-		     src/wimboot.c			\
-		     include/wimlib/win32_common.h	\
-		     include/wimlib/win32.h		\
+		     src/win32_vss.c			\
 		     include/wimlib/wimboot.h		\
+		     include/wimlib/win32.h		\
+		     include/wimlib/win32_common.h	\
+		     include/wimlib/win32_vss.h		\
 		     include/wimlib/wof.h
+PLATFORM_LIBS = -lmsvcrt -lntdll
 else
 libwim_la_SOURCES += src/unix_apply.c		\
 		     src/unix_capture.c
+PLATFORM_LIBS =
+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
+endif
 endif
 
 libwim_la_CFLAGS =		\
@@ -182,7 +199,7 @@ libwim_la_CFLAGS =		\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 21:0:6
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 25:0:10
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\
@@ -191,14 +208,15 @@ libwim_la_LIBADD =		\
 	$(LIBNTFS_3G_LIBS)	\
 	$(LIBFUSE_LIBS)		\
 	$(LIBRT_LIBS)		\
-	$(LIBCRYPTO_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 --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+	$(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  \
@@ -318,7 +336,7 @@ endif
 
 EXTRA_DIST +=					\
 	tests/common_tests.sh			\
-	tests/tests-common.sh			\
+	tests/test_utils.sh			\
 	tests/security_descriptor_1.base64	\
 	tests/security_descriptor_1.bin		\
 	tests/security_descriptor_2.base64	\
@@ -331,4 +349,9 @@ else
 TESTS = $(dist_check_SCRIPTS)
 endif
 
+# Extra test programs (not run by 'make check')
+EXTRA_PROGRAMS = tests/wlfuzz
+tests_wlfuzz_SOURCES = tests/wlfuzz.c
+tests_wlfuzz_LDADD = $(top_builddir)/libwim.la
+
 ##############################################################################