Update for ntfs-3g 2013.1.13

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dc20f727db7755bcca1ef03848dcf3f3f551452c..98a247eaabebd4a1ea050d60e1442bf92d26f7dc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,49 +7,67 @@ AM_CFLAGS     = -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
+libwim_la_LDFLAGS = -version-info 2:1:0
+
 libwim_la_SOURCES =            \
-       src/comp.c              \
-       src/comp.h              \
-       src/decomp.c            \
-       src/decomp.h            \
+       src/add_image.c         \
+       src/buffer_io.h         \
+       src/compress.c          \
+       src/compress.h          \
+       src/decompress.c        \
+       src/decompress.h        \
+       src/delete_image.c      \
        src/dentry.c            \
        src/dentry.h            \
+       src/encoding.c          \
        src/endianness.h        \
-       src/extract.c           \
+       src/export_image.c      \
+       src/extract_image.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                \
+       src/lz77.c              \
        src/lzx-common.c        \
-       src/lzx-comp.c          \
-       src/lzx-decomp.c        \
+       src/lzx-compress.c      \
+       src/lzx-decompress.c    \
        src/lzx.h               \
-       src/modify.c            \
-       src/mount.c             \
+       src/metadata_resource.c \
+       src/mount_image.c       \
        src/resource.c          \
+       src/rbtree.c            \
+       src/rbtree.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              \
+       src/verify.c            \
        src/wim.c               \
        src/wimlib.h            \
        src/wimlib_internal.h   \
        src/write.c             \
        src/xml.c               \
        src/xml.h               \
-       src/xpress-comp.c       \
-       src/xpress-decomp.c     \
+       src/xpress-compress.c   \
+       src/xpress-decompress.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
-EXTRA_libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
+libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
 STRIP_FPIC = sh $(top_srcdir)/build-aux/strip_fPIC.sh
 
 sha1-ssse3.lo:src/sha1-ssse3.asm
@@ -60,15 +78,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,11 +101,19 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
 
-EXTRA_DIST =                   \
-       COPYING.LIB             \
-       build-aux/strip_fPIC.sh \
-       debian                  \
-       programs/install.cmd
+EXTRA_DIST =                                   \
+       build-aux/strip_fPIC.sh                 \
+       archlinux                               \
+       debian                                  \
+       rpm                                     \
+       programs/install.cmd                    \
+       programs/wimapply.c                     \
+       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
@@ -103,8 +132,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
+
+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)
+