X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=f0a00573c166e15cea38c94c1fa14b92fe5eb939;hb=de988664c349cc93d85e4ea559f1e9c2aa9d9fd1;hp=b789fa4123b59b7840c8a1f70c677994d4641cce;hpb=21554dbe867cf8db47a8ac0d41c75e3a1b935842;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index b789fa41..f0a00573 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		\
@@ -34,6 +36,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 +58,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
@@ -73,7 +73,8 @@ libwim_la_LIBADD =		\
 	$(LIBNTFS_3G_LDADD)	\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LDADD)	\
-	$(SSSE3_SHA1_OBJ)
+	$(SSSE3_SHA1_OBJ)	\
+	$(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
@@ -92,10 +93,17 @@ 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/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
@@ -120,6 +128,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)