Update NEWS and add imagex-optimize

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2d04ea791b0d2fdfe57886a5b7c24ea16fd26dc..1835be1cc9f704580ce9f8d9e6e1a53617d0a150 100644 (file)
--- 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              \
@@ -68,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)            \
@@ -89,7 +95,9 @@ include_HEADERS = src/wimlib.h
 
 EXTRA_DIST =                                   \
        build-aux/strip_fPIC.sh                 \
+       archlinux                               \
        debian                                  \
+       rpm                                     \
        programs/install.cmd                    \
        tests/common_tests.sh                   \
        tests/security_descriptor_1.base64      \
@@ -114,6 +122,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
@@ -123,10 +132,13 @@ $(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                    \
+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