X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=6754144bd03f69f2d4a5e00f536afba999265eb2;hp=cc91d1760393801fc9e484778e4636cc885054de;hb=4ac0a4105886f5d8a56ee3feacaaa19562d89e6a;hpb=20ca25765c07d23e82357dc29a52eefdd06a2382

diff --git a/Makefile.am b/Makefile.am
index cc91d176..6754144b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,15 +8,18 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS	= -I$(top_srcdir)/include $(PLATFORM_CPPFLAGS)	\
 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-AM_CFLAGS	= -std=c99 $(PLATFORM_CFLAGS) -fno-common	\
+# Note: -std=gnu99 instead of -std=c99 is needed for unnamed structs and unions,
+# which are in C11 but not C99.  But we can't yet actually use -std=c11 because
+# we want to support older versions of gcc.
+AM_CFLAGS	= -std=gnu99 $(PLATFORM_CFLAGS) -fno-common	\
 		  -Wmissing-prototypes -Wstrict-prototypes	\
 		  -Wundef -Wno-pointer-sign
 
 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
 
 ##############################################################################
@@ -33,7 +36,7 @@ wimlib.pc: config.status
 libwim_la_SOURCES =		\
 	src/add_image.c		\
 	src/avl_tree.c		\
-	src/capture_common.c	\
+	src/blob_table.c	\
 	src/compress.c		\
 	src/compress_common.c	\
 	src/compress_parallel.c	\
@@ -55,32 +58,28 @@ libwim_la_SOURCES =		\
 	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/lzx-common.c	\
-	src/lzx-compress.c	\
-	src/lzx-decompress.c	\
+	src/lcpit_matchfinder.c	\
+	src/lzms_common.c	\
+	src/lzms_compress.c	\
+	src/lzms_decompress.c	\
+	src/lzx_common.c	\
+	src/lzx_compress.c	\
+	src/lzx_decompress.c	\
 	src/metadata_resource.c	\
 	src/mount_image.c	\
 	src/pathlist.c		\
 	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,21 +87,22 @@ libwim_la_SOURCES =		\
 	src/update_image.c	\
 	src/util.c		\
 	src/verify.c		\
-	src/wildcard.c		\
 	src/wim.c		\
 	src/write.c		\
+	src/x86_cpu_features.c	\
 	src/xml.c		\
-	src/xpress-compress.c	\
-	src/xpress-decompress.c \
+	src/xml_windows.c	\
+	src/xpress_compress.c	\
+	src/xpress_decompress.c \
+	include/wimlib/alloca.h		\
 	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/blob_table.h	\
+	include/wimlib/bt_matchfinder.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	\
@@ -115,42 +115,46 @@ libwim_la_SOURCES =		\
 	include/wimlib/error.h		\
 	include/wimlib/file_io.h	\
 	include/wimlib/glob.h		\
+	include/wimlib/guid.h		\
+	include/wimlib/hc_matchfinder.h	\
 	include/wimlib/header.h		\
 	include/wimlib/inode.h		\
 	include/wimlib/inode_table.h	\
 	include/wimlib/integrity.h	\
+	include/wimlib/lcpit_matchfinder.h	\
 	include/wimlib/list.h		\
-	include/wimlib/lookup_table.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/lz_hash.h	\
+	include/wimlib/lzms_common.h	\
 	include/wimlib/lzms_constants.h	\
-	include/wimlib/lzx.h		\
+	include/wimlib/lzx_common.h	\
 	include/wimlib/lzx_constants.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		\
+	include/wimlib/solid.h		\
 	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/wildcard.h	\
 	include/wimlib/wim.h		\
 	include/wimlib/write.h		\
+	include/wimlib/x86_cpu_features.h	\
 	include/wimlib/xml.h		\
-	include/wimlib/xpress.h
+	include/wimlib/xml_windows.h	\
+	include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
 libwim_la_SOURCES += src/ntfs-3g_apply.c	\
@@ -159,49 +163,66 @@ 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
 
-EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
-libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
-EXTRA_DIST += build-aux/nasm_lt.sh
-
-src/sha1-ssse3.lo:src/sha1-ssse3.asm
-	$(LIBTOOL) --mode=compile --tag NASM $(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 $@
+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)	\
 	$(LIBXML2_CFLAGS)	\
-	$(LIBFUSE_CFLAGS)	\
 	$(LIBNTFS_3G_CFLAGS)	\
+	$(LIBFUSE_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 18:0:3
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:11
 
 libwim_la_LIBADD =		\
+	$(PTHREAD_LIBS)		\
 	$(LIBXML2_LIBS)		\
+	$(LIBNTFS_3G_LIBS)	\
 	$(LIBFUSE_LIBS)		\
 	$(LIBRT_LIBS)		\
-	$(LIBNTFS_3G_LIBS)	\
-	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LIBS)	\
-	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)
+	$(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 $@
+
+EXTRA_DIST += build-aux/nasm_lt.sh
+endif
 
 ##############################################################################
 #				Programs				     #
@@ -314,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	\
@@ -327,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
+
 ##############################################################################