X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=60c3af3c05164a86ef228eb31ecd7850839f9139;hp=6ba0010619386836e400302dc62d3aa7d748416a;hb=ce81b1490c131f0be20c21661bc8f954d45c417c;hpb=7489a761bbd3f5d471c82dafe2c07e6420de6ba7

diff --git a/Makefile.am b/Makefile.am
index 6ba00106..60c3af3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,8 @@ AM_CFLAGS	= -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
+libwim_la_LDFLAGS = -version-info 1:0:0
+
 libwim_la_SOURCES =		\
 	src/comp.c		\
 	src/comp.h		\
@@ -31,9 +33,10 @@ libwim_la_SOURCES =		\
 	src/lzx.h		\
 	src/modify.c		\
 	src/mount.c		\
-	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		\
@@ -54,9 +57,8 @@ libwim_la_SOURCES =		\
 	src/xpress.h
 
 if WITH_NTFS_3G
-if !WITH_NEW_NTFS_3G
-libwim_la_SOURCES += src/ntfs-3g_security.c
-endif
+libwim_la_SOURCES += src/ntfs-apply.c	\
+		     src/ntfs-capture.c
 endif
 
 
@@ -75,7 +77,8 @@ libwim_la_LIBADD =		\
 	$(LIBNTFS_3G_LDADD)	\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LDADD)	\
-	$(SSSE3_SHA1_OBJ)
+	$(SSSE3_SHA1_OBJ)	\
+	$(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
@@ -94,10 +97,18 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
 
-EXTRA_DIST =			\
-	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/tests-common.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
@@ -116,12 +127,26 @@ man1_MANS =			\
 	doc/imagex-join.1	\
 	doc/imagex-mount.1	\
 	doc/imagex-mountrw.1	\
+	doc/imagex-optimize.1	\
 	doc/imagex-split.1	\
 	doc/imagex-unmount.1	\
 	doc/mkwinpeimg.1
 
 $(man1_MANS): config.status
 
-dist_check_SCRIPTS = tests/test-imagex tests/test-imagex-ntfs
+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)