diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/gensquashfs/Makemodule.am | 2 | ||||
| -rw-r--r-- | tests/libfstree/Makemodule.am | 2 | ||||
| -rw-r--r-- | tests/libio/Makemodule.am | 2 | ||||
| -rw-r--r-- | tests/libsqfs/Makemodule.am | 2 | ||||
| -rw-r--r-- | tests/libtar/Makemodule.am | 2 | ||||
| -rw-r--r-- | tests/tar2sqfs/Makemodule.am | 2 |
8 files changed, 0 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index 804bdae..7117744 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,6 @@ include lib/util/Makemodule.am include lib/xfrm/Makemodule.am include lib/io/Makemodule.am -if BUILD_TOOLS include lib/fstree/Makemodule.am include lib/common/Makemodule.am include lib/tar/Makemodule.am @@ -40,7 +39,6 @@ include bin/rdsquashfs/Makemodule.am include bin/sqfs2tar/Makemodule.am include bin/sqfsdiff/Makemodule.am include bin/tar2sqfs/Makemodule.am -endif include extras/Makemodule.am diff --git a/configure.ac b/configure.ac index 8085bd2..09f5dfd 100644 --- a/configure.ac +++ b/configure.ac @@ -115,19 +115,12 @@ AC_ARG_WITH([pthread], [Build without pthread based block compressor])], [], [with_pthread="yes"]) -AC_ARG_WITH([tools], - [AS_HELP_STRING([--without-tools], - [Only build libsquashfs, do not build the tools.])], - [], [with_tools="yes"]) - AC_ARG_ENABLE([custom-alloc], [AS_HELP_STRING([--disable-custom-alloc], [Do not used any custom allocators.])], [], [enable_custom_alloc="yes"]) AS_IF([test "x$build_windows" = "xyes"], [with_pthread="no"], []) -AS_IF([test "x$with_tools" != "xyes"], [with_selinux="no"], []) -AM_CONDITIONAL([BUILD_TOOLS], [test "x$with_tools" = "xyes"]) ##### Doxygen reference manual ##### @@ -318,7 +311,6 @@ AC_MSG_RESULT([ Custom allocators: ${enable_custom_alloc} - Building tools: ${with_tools} Doxygen found: ${with_doxygen} warnings: diff --git a/tests/gensquashfs/Makemodule.am b/tests/gensquashfs/Makemodule.am index 70dc375..553f2a8 100644 --- a/tests/gensquashfs/Makemodule.am +++ b/tests/gensquashfs/Makemodule.am @@ -50,12 +50,10 @@ GENSQUASHFS_TESTS = \ test_filemap_xattr test_fstree_from_file test_fstree_from_dir \ test_fstree_glob1 test_sort_file -if BUILD_TOOLS noinst_PROGRAMS += fstree_fuzz check_PROGRAMS += $(GENSQUASHFS_TESTS) TESTS += $(GENSQUASHFS_TESTS) -endif EXTRA_DIST += $(GENDATADIR)/xattr1.txt $(GENDATADIR)/fstree1.txt EXTRA_DIST += $(GENDATADIR)/fstree_glob1.txt $(GENDATADIR)/fstree_glob2.txt diff --git a/tests/libfstree/Makemodule.am b/tests/libfstree/Makemodule.am index 5ae44a6..14e1b38 100644 --- a/tests/libfstree/Makemodule.am +++ b/tests/libfstree/Makemodule.am @@ -34,7 +34,5 @@ FSTREE_TESTS = \ test_add_by_path test_get_path test_fstree_sort \ test_fstree_init -if BUILD_TOOLS check_PROGRAMS += $(FSTREE_TESTS) TESTS += $(FSTREE_TESTS) -endif diff --git a/tests/libio/Makemodule.am b/tests/libio/Makemodule.am index 2803b43..e031973 100644 --- a/tests/libio/Makemodule.am +++ b/tests/libio/Makemodule.am @@ -6,9 +6,7 @@ test_get_line_CPPFLAGS += -DTESTFILE=$(top_srcdir)/tests/libio/get_line.txt test_sparse_fb_SOURCES = tests/libio/sparse_fb.c test_sparse_fb_LDADD = libio.a libutil.a libcompat.a -if BUILD_TOOLS check_PROGRAMS += test_get_line test_sparse_fb TESTS += test_get_line test_sparse_fb -endif EXTRA_DIST += $(top_srcdir)/tests/libio/get_line.txt diff --git a/tests/libsqfs/Makemodule.am b/tests/libsqfs/Makemodule.am index 38f5006..0c91be4 100644 --- a/tests/libsqfs/Makemodule.am +++ b/tests/libsqfs/Makemodule.am @@ -16,9 +16,7 @@ test_get_node_path_LDADD = libcommon.a libsquashfs.la libcompat.a LIBSQFS_TESTS = \ test_abi test_table test_xattr_writer test_get_node_path -if BUILD_TOOLS noinst_PROGRAMS += xattr_benchmark -endif check_PROGRAMS += $(LIBSQFS_TESTS) TESTS += $(LIBSQFS_TESTS) diff --git a/tests/libtar/Makemodule.am b/tests/libtar/Makemodule.am index 8802409..07c19cc 100644 --- a/tests/libtar/Makemodule.am +++ b/tests/libtar/Makemodule.am @@ -168,11 +168,9 @@ LIBTAR_TESTS = \ test_tar_xattr_bsd test_tar_xattr_schily test_tar_xattr_schily_bin \ test_tar_target_filled -if BUILD_TOOLS check_PROGRAMS += $(LIBTAR_TESTS) TESTS += $(LIBTAR_TESTS) noinst_PROGRAMS += tar_fuzz -endif EXTRA_DIST += $(TARDATADIR) diff --git a/tests/tar2sqfs/Makemodule.am b/tests/tar2sqfs/Makemodule.am index 738c607..031416a 100644 --- a/tests/tar2sqfs/Makemodule.am +++ b/tests/tar2sqfs/Makemodule.am @@ -1,7 +1,5 @@ -if BUILD_TOOLS check_SCRIPTS += tests/tar2sqfs/test_tar_sqfs.sh TESTS += tests/tar2sqfs/test_tar_sqfs.sh -endif EXTRA_DIST += $(top_srcdir)/tests/tar2sqfs/simple.tar EXTRA_DIST += $(top_srcdir)/tests/tar2sqfs/sqfs.sha512 |