struct args => struct split_args

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9c36d5a12ad210039b93f6509427442f007a091f..69c360ab8062fc700f1cb4dd2100204da136840a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,13 +53,6 @@ libwim_la_SOURCES =          \
        src/xpress-decomp.c     \
        src/xpress.h
 
-if WITH_NTFS_3G
-if !WITH_NEW_NTFS_3G
-libwim_la_SOURCES += src/ntfs-3g_security.c
-endif
-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
@@ -94,10 +87,15 @@ 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                 \
+       debian                                  \
+       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
@@ -122,8 +120,13 @@ man1_MANS =                        \
 
 $(man1_MANS): config.status
 
-check_PROGRAMS = tests/ntfs-cmp
-tests_ntfs_cmp_SOURCES = tests/ntfs-cmp.c
-dist_check_SCRIPTS = tests/test-imagex tests/test-imagex-ntfs
+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
+
 TESTS = $(dist_check_SCRIPTS)