X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=3f04be86da1402247e3721e7f9706fbb2c849add;hb=c3ef484d402e49ae76c562ce77b81a5d6dcd8029;hp=5a41cf956ae19c293d6441a725a37b2e315e8339;hpb=3c0a7e515447a43531fc864440f0676d319c3c91;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 5a41cf95..3f04be86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,9 @@ libwim_la_SOURCES =		\
 	src/ntfs-apply.c	\
 	src/ntfs-capture.c	\
 	src/resource.c		\
+	src/rbtree.c		\
+	src/rbtree.h		\
+	src/rbtree_augmented.h	\
 	src/security.c		\
 	src/security.h		\
 	src/sha1.c		\
@@ -53,11 +56,6 @@ libwim_la_SOURCES =		\
 	src/xpress-decomp.c	\
 	src/xpress.h
 
-if WITH_NTFS_3G
-libwim_la_SOURCES += src/ntfs-3g_security.c
-endif
-
-
 EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
 libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
 STRIP_FPIC = sh $(top_srcdir)/build-aux/strip_fPIC.sh
@@ -92,11 +90,17 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
 
-EXTRA_DIST =			\
-	COPYING.LIB		\
-	build-aux/strip_fPIC.sh	\
-	debian			\
-	programs/install.cmd
+EXTRA_DIST =					\
+	build-aux/strip_fPIC.sh			\
+	archlinux				\
+	debian					\
+	rpm					\
+	programs/install.cmd			\
+	tests/common_tests.sh			\
+	tests/security_descriptor_1.base64	\
+	tests/security_descriptor_1.bin		\
+	tests/security_descriptor_2.base64	\
+	tests/security_descriptor_2.bin
 
 pkgconfigdir	= @pkgconfigdir@
 pkgconfig_DATA	= wimlib.pc
@@ -121,6 +125,19 @@ man1_MANS =			\
 
 $(man1_MANS): config.status
 
-dist_check_SCRIPTS = tests/test-imagex
+check_PROGRAMS = tests/tree-cmp
+tests_tree_cmp_SOURCES = tests/tree-cmp.c
+
+dist_check_SCRIPTS = tests/test-imagex \
+		     tests/test-imagex-capture_and_apply
+
+if WITH_FUSE
+dist_check_SCRIPTS += tests/test-imagex-mount
+endif
+
+if WITH_NTFS_3G
+dist_check_SCRIPTS += tests/test-imagex-ntfs
+endif
+
 TESTS = $(dist_check_SCRIPTS)