X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=6754144bd03f69f2d4a5e00f536afba999265eb2;hp=90646b44447f52d1244d253f1ea8bcc41ec0df07;hb=5356aeb52cca00d53f7708398be6a29a25c2e2fd;hpb=51829aecdac415b417ab5b8ac897014bb780de10

diff --git a/Makefile.am b/Makefile.am
index 90646b44..6754144b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@ AM_CFLAGS	= -std=gnu99 $(PLATFORM_CFLAGS) -fno-common	\
 
 AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST	= README README.WINDOWS				\
-		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
-		  examples					\
+EXTRA_DIST	= README README.WINDOWS					\
+		  COPYING COPYING.GPLv3	COPYING.LGPLv3 COPYING.CC0	\
+		  examples						\
 		  archlinux debian rpm
 
 ##############################################################################
@@ -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	\
@@ -76,6 +75,7 @@ libwim_la_SOURCES =		\
 	src/registry.c		\
 	src/reparse.c		\
 	src/resource.c		\
+	src/scan.c		\
 	src/security.c		\
 	src/sha1.c		\
 	src/solid.c		\
@@ -101,7 +101,6 @@ 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/compressor_ops.h	\
@@ -139,6 +138,7 @@ libwim_la_SOURCES =		\
 	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		\
@@ -181,6 +181,16 @@ libwim_la_SOURCES += src/unix_apply.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 =		\
 	$(AM_CFLAGS)		\
 	$(PTHREAD_CFLAGS)	\
@@ -189,12 +199,11 @@ libwim_la_CFLAGS =		\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 24:0:9
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:11
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\
 	$(LIBXML2_LIBS)		\
-	$(LTLIBICONV)		\
 	$(LIBNTFS_3G_LIBS)	\
 	$(LIBFUSE_LIBS)		\
 	$(LIBRT_LIBS)		\
@@ -326,7 +335,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	\
@@ -339,4 +348,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
+
 ##############################################################################