X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=5bcf8c1fc415843a069d9907883c5999200bafc3;hp=2e18838653097e6db609af10248f22a2c3e244d2;hb=d5c2c580d35447207e1e8c0d62c9e55b77ba20d1;hpb=54193a504d8dcf1e2dfae727c76cd1b44884518b

diff --git a/Makefile.am b/Makefile.am
index 2e188386..5bcf8c1f 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		\
@@ -53,6 +56,12 @@ libwim_la_SOURCES =		\
 	src/xpress-decomp.c	\
 	src/xpress.h
 
+if WITH_NTFS_3G
+libwim_la_SOURCES += src/ntfs-apply.c	\
+		     src/ntfs-capture.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
@@ -68,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)		\
@@ -87,11 +97,17 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
 
-EXTRA_DIST =			\
-	build-aux/strip_fPIC.sh	\
-	debian			\
-	programs/install.cmd
-	tests/common_tests.sh
+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
@@ -110,6 +126,7 @@ 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
@@ -119,10 +136,16 @@ $(man1_MANS): config.status
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
-dist_check_SCRIPTS = tests/test-imagex				\
-		     tests/test-imagex-mount			\
-		     tests/test-imagex-capture_and_apply	\
-		     tests/test-imagex-ntfs
+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)