X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=603c8d9c1c8e03a897b01138b2bb467d9a45d9bb;hp=10511f78d8f9d1fa6b6384190c950494ea56fa83;hb=refs%2Fheads%2Fmaster;hpb=8895e346ab7a4df65c980ba435d1e5d1c2654d3f

diff --git a/Makefile.am b/Makefile.am
index 10511f78..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				\
+EXTRA_DIST	= README.md README.WINDOWS.md NEWS.md		\
 		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
 		  examples					\
-		  archlinux debian rpm
+		  tools/get-version-number.sh tools/windows-build.sh
 
 ##############################################################################
 #				Library					     #
@@ -36,11 +36,12 @@ 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	\
 	src/compress_serial.c	\
+	src/cpu_features.c	\
 	src/decompress.c	\
 	src/decompress_common.c	\
 	src/delete_image.c	\
@@ -59,8 +60,6 @@ libwim_la_SOURCES =		\
 	src/iterate_dir.c	\
 	src/join.c		\
 	src/lcpit_matchfinder.c	\
-	src/lcpit_matchfinder_templates.h	\
-	src/lookup_table.c	\
 	src/lzms_common.c	\
 	src/lzms_compress.c	\
 	src/lzms_decompress.c	\
@@ -71,25 +70,30 @@ libwim_la_SOURCES =		\
 	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		\
+	src/threads.c		\
 	src/timestamp.c		\
 	src/update_image.c	\
 	src/util.c		\
 	src/verify.c		\
-	src/wildcard.c		\
 	src/wim.c		\
 	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		\
@@ -97,15 +101,14 @@ libwim_la_SOURCES =		\
 	include/wimlib/assert.h		\
 	include/wimlib/avl_tree.h	\
 	include/wimlib/bitops.h		\
+	include/wimlib/blob_table.h	\
 	include/wimlib/bt_matchfinder.h	\
-	include/wimlib/callback.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	\
+	include/wimlib/cpu_features.h	\
 	include/wimlib/decompressor_ops.h	\
 	include/wimlib/decompress_common.h	\
 	include/wimlib/dentry.h		\
@@ -115,43 +118,47 @@ 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/lcpit_matchfinder.h	\
 	include/wimlib/list.h		\
-	include/wimlib/lookup_table.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_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		\
 	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	\
 	include/wimlib/unix_data.h	\
 	include/wimlib/util.h		\
-	include/wimlib/wildcard.h	\
 	include/wimlib/wim.h		\
 	include/wimlib/write.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
@@ -161,52 +168,47 @@ 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 = -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
+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 19:0:4
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 41:0:26
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\
-	$(LIBXML2_LIBS)		\
-	$(LTLIBICONV)		\
 	$(LIBNTFS_3G_LIBS)	\
 	$(LIBFUSE_LIBS)		\
 	$(LIBRT_LIBS)		\
-	$(LIBCRYPTO_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 \
-	$(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
+	$(PLATFORM_LIBS)
 
 ##############################################################################
 #				Programs				     #
@@ -263,7 +265,7 @@ install-exec-hook:
 install-data-hook:
 	for cmd in $(wimlib_imagex_cmds); do				\
 		cd $(DESTDIR)$(mandir)/man1 &&				\
-			ln -sf wimlib-imagex-$${cmd}.1 wim$${cmd}.1;	\
+			ln -sf wim$${cmd}.1 wimlib-imagex-$${cmd}.1;	\
 	done
 
 uninstall-hook:
@@ -276,24 +278,24 @@ uninstall-hook:
 #				Documentation				     #
 ##############################################################################
 
-man1_MANS =					\
-	doc/man1/wimlib-imagex.1		\
-	doc/man1/wimlib-imagex-append.1		\
-	doc/man1/wimlib-imagex-apply.1		\
-	doc/man1/wimlib-imagex-capture.1	\
-	doc/man1/wimlib-imagex-delete.1		\
-	doc/man1/wimlib-imagex-dir.1		\
-	doc/man1/wimlib-imagex-export.1		\
-	doc/man1/wimlib-imagex-extract.1	\
-	doc/man1/wimlib-imagex-info.1		\
-	doc/man1/wimlib-imagex-join.1		\
-	doc/man1/wimlib-imagex-mount.1		\
-	doc/man1/wimlib-imagex-mountrw.1	\
-	doc/man1/wimlib-imagex-optimize.1	\
-	doc/man1/wimlib-imagex-split.1		\
-	doc/man1/wimlib-imagex-unmount.1	\
-	doc/man1/wimlib-imagex-update.1		\
-	doc/man1/wimlib-imagex-verify.1		\
+man1_MANS =				\
+	doc/man1/wimlib-imagex.1	\
+	doc/man1/wimappend.1		\
+	doc/man1/wimapply.1		\
+	doc/man1/wimcapture.1		\
+	doc/man1/wimdelete.1		\
+	doc/man1/wimdir.1		\
+	doc/man1/wimexport.1		\
+	doc/man1/wimextract.1		\
+	doc/man1/wiminfo.1		\
+	doc/man1/wimjoin.1		\
+	doc/man1/wimmount.1		\
+	doc/man1/wimmountrw.1		\
+	doc/man1/wimoptimize.1		\
+	doc/man1/wimsplit.1		\
+	doc/man1/wimunmount.1		\
+	doc/man1/wimupdate.1		\
+	doc/man1/wimverify.1		\
 	doc/man1/mkwinpeimg.1
 
 EXTRA_DIST += $(man1_MANS)
@@ -319,11 +321,13 @@ endif
 
 EXTRA_DIST +=					\
 	tests/common_tests.sh			\
-	tests/tests-common.sh			\
+	tests/exclusionlists			\
+	tests/test_utils.sh			\
 	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.
@@ -332,4 +336,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
+
 ##############################################################################