X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=5bcf8c1fc415843a069d9907883c5999200bafc3;hp=58d2367130704945d42556c53a669dd9e3a49ce4;hb=3c5b7e3b98a10c17880e5f658a0d2ab4f8fcef7b;hpb=5577584b8a50baa958f832ddb9418986e3e38847

diff --git a/Makefile.am b/Makefile.am
index 58d23671..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		\
@@ -16,10 +18,12 @@ libwim_la_SOURCES =		\
 	src/dentry.h		\
 	src/endianness.h	\
 	src/extract.c		\
+	src/hardlink.c		\
 	src/header.c		\
 	src/integrity.c		\
 	src/io.h		\
 	src/join.c		\
+	src/list.h		\
 	src/lookup_table.c	\
 	src/lookup_table.h	\
 	src/lz.c		\
@@ -30,11 +34,15 @@ libwim_la_SOURCES =		\
 	src/modify.c		\
 	src/mount.c		\
 	src/resource.c		\
+	src/rbtree.c		\
+	src/rbtree.h		\
+	src/rbtree_augmented.h	\
 	src/security.c		\
 	src/security.h		\
 	src/sha1.c		\
 	src/sha1.h		\
 	src/split.c		\
+	src/symlink.c		\
 	src/timestamp.h		\
 	src/util.c		\
 	src/util.h		\
@@ -48,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
@@ -60,15 +74,18 @@ sha1-ssse3.lo:src/sha1-ssse3.asm
 libwim_la_LIBADD =		\
 	$(LIBXML2_LDADD)	\
 	$(LIBFUSE_LDADD)	\
+	$(LIBNTFS_3G_LDADD)	\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LDADD)	\
-	$(SSSE3_SHA1_OBJ)
+	$(SSSE3_SHA1_OBJ)	\
+	$(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
 	-fvisibility=hidden	\
 	$(LIBXML2_CFLAGS)	\
 	$(LIBFUSE_CFLAGS)	\
+	$(LIBNTFS_3G_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
 
@@ -80,13 +97,17 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
 
-EXTRA_DIST =			\
-	COPYING.LIB		\
-	build-aux/strip_fPIC.sh	\
-	debian			\
-	programs/install.cmd	\
-	tests/dir		\
-	tests/dir2
+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
@@ -105,12 +126,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
+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)