X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=3579651a0ecf59678e00f91b76229454e94dc577;hb=f73332717baf4ab155b57f64ec9dbcd344d7f0c1;hp=2987b1004ec2b9aa3a387f3bc28f77b029d31fb5;hpb=eb044d0f341a0b24dc32b64df1107a372017956b;p=wimlib diff --git a/Makefile.am b/Makefile.am index 2987b100..3579651a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,7 @@ AM_LDFLAGS = $(PLATFORM_LDFLAGS) EXTRA_DIST = README README.WINDOWS \ COPYING COPYING.GPLv3 COPYING.LGPLv3 \ - examples \ - archlinux debian rpm + examples ############################################################################## # Library # @@ -37,11 +36,11 @@ libwim_la_SOURCES = \ src/add_image.c \ src/avl_tree.c \ src/blob_table.c \ - src/capture_common.c \ src/compress.c \ src/compress_common.c \ src/compress_parallel.c \ src/compress_serial.c \ + src/cpu_features.c \ src/decompress.c \ src/decompress_common.c \ src/delete_image.c \ @@ -76,6 +75,7 @@ libwim_la_SOURCES = \ src/registry.c \ src/reparse.c \ src/resource.c \ + src/scan.c \ src/security.c \ src/sha1.c \ src/solid.c \ @@ -89,7 +89,6 @@ libwim_la_SOURCES = \ src/verify.c \ src/wim.c \ src/write.c \ - src/x86_cpu_features.c \ src/xml.c \ src/xml_windows.c \ src/xpress_compress.c \ @@ -101,12 +100,12 @@ libwim_la_SOURCES = \ include/wimlib/bitops.h \ include/wimlib/blob_table.h \ include/wimlib/bt_matchfinder.h \ - include/wimlib/capture.h \ include/wimlib/case.h \ include/wimlib/compiler.h \ include/wimlib/compressor_ops.h \ include/wimlib/compress_common.h \ include/wimlib/chunk_compressor.h \ + include/wimlib/cpu_features.h \ include/wimlib/decompressor_ops.h \ include/wimlib/decompress_common.h \ include/wimlib/dentry.h \ @@ -124,13 +123,13 @@ libwim_la_SOURCES = \ include/wimlib/integrity.h \ include/wimlib/lcpit_matchfinder.h \ include/wimlib/list.h \ - include/wimlib/lz_extend.h \ - include/wimlib/lz_hash.h \ include/wimlib/lzms_common.h \ include/wimlib/lzms_constants.h \ include/wimlib/lzx_common.h \ include/wimlib/lzx_constants.h \ + include/wimlib/matchfinder_common.h \ include/wimlib/metadata.h \ + include/wimlib/object_id.h \ include/wimlib/pathlist.h \ include/wimlib/paths.h \ include/wimlib/pattern.h \ @@ -138,10 +137,12 @@ libwim_la_SOURCES = \ include/wimlib/registry.h \ include/wimlib/reparse.h \ include/wimlib/resource.h \ + include/wimlib/scan.h \ include/wimlib/security.h \ include/wimlib/security_descriptor.h \ include/wimlib/sha1.h \ include/wimlib/solid.h \ + include/wimlib/tagged_items.h \ include/wimlib/textfile.h \ include/wimlib/timestamp.h \ include/wimlib/types.h \ @@ -150,7 +151,7 @@ libwim_la_SOURCES = \ include/wimlib/util.h \ include/wimlib/wim.h \ include/wimlib/write.h \ - include/wimlib/x86_cpu_features.h \ + include/wimlib/xattr.h \ include/wimlib/xml.h \ include/wimlib/xml_windows.h \ include/wimlib/xpress_constants.h @@ -173,9 +174,16 @@ libwim_la_SOURCES += src/wimboot.c \ include/wimlib/win32_common.h \ include/wimlib/win32_vss.h \ include/wimlib/wof.h +PLATFORM_LIBS = -lntdll else libwim_la_SOURCES += src/unix_apply.c \ src/unix_capture.c +PLATFORM_LIBS = +endif + +if ENABLE_TEST_SUPPORT +libwim_la_SOURCES += src/test_support.c \ + include/wimlib/test_support.h endif libwim_la_CFLAGS = \ @@ -183,33 +191,17 @@ libwim_la_CFLAGS = \ $(PTHREAD_CFLAGS) \ $(LIBXML2_CFLAGS) \ $(LIBNTFS_3G_CFLAGS) \ - $(LIBFUSE_CFLAGS) \ - $(LIBCRYPTO_CFLAGS) + $(LIBFUSE_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 24:0:9 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 36:0:21 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ $(LIBXML2_LIBS) \ - $(LTLIBICONV) \ $(LIBNTFS_3G_LIBS) \ $(LIBFUSE_LIBS) \ $(LIBRT_LIBS) \ - $(LIBCRYPTO_LIBS) - -if ENABLE_SSSE3_SHA1 -libwim_la_SOURCES += src/sha1-ssse3.asm -libwim_la_LIBADD += src/sha1-ssse3.lo - -src/sha1-ssse3.lo:src/sha1-ssse3.asm - $(LIBTOOL) --mode=compile $(srcdir)/build-aux/nasm_lt.sh \ - $(NASM) $(NAFLAGS) $(NASM_PLATFORM_FLAGS) \ - -DINTEL_SHA1_UPDATE_FUNCNAME=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_ssse3 \ - -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_default \ - $< -o $@ - -EXTRA_DIST += build-aux/nasm_lt.sh -endif + $(PLATFORM_LIBS) ############################################################################## # Programs # @@ -266,7 +258,7 @@ install-exec-hook: install-data-hook: for cmd in $(wimlib_imagex_cmds); do \ cd $(DESTDIR)$(mandir)/man1 && \ - ln -sf wimlib-imagex-$${cmd}.1 wim$${cmd}.1; \ + ln -sf wim$${cmd}.1 wimlib-imagex-$${cmd}.1; \ done uninstall-hook: @@ -279,24 +271,24 @@ uninstall-hook: # Documentation # ############################################################################## -man1_MANS = \ - doc/man1/wimlib-imagex.1 \ - doc/man1/wimlib-imagex-append.1 \ - doc/man1/wimlib-imagex-apply.1 \ - doc/man1/wimlib-imagex-capture.1 \ - doc/man1/wimlib-imagex-delete.1 \ - doc/man1/wimlib-imagex-dir.1 \ - doc/man1/wimlib-imagex-export.1 \ - doc/man1/wimlib-imagex-extract.1 \ - doc/man1/wimlib-imagex-info.1 \ - doc/man1/wimlib-imagex-join.1 \ - doc/man1/wimlib-imagex-mount.1 \ - doc/man1/wimlib-imagex-mountrw.1 \ - doc/man1/wimlib-imagex-optimize.1 \ - doc/man1/wimlib-imagex-split.1 \ - doc/man1/wimlib-imagex-unmount.1 \ - doc/man1/wimlib-imagex-update.1 \ - doc/man1/wimlib-imagex-verify.1 \ +man1_MANS = \ + doc/man1/wimlib-imagex.1 \ + doc/man1/wimappend.1 \ + doc/man1/wimapply.1 \ + doc/man1/wimcapture.1 \ + doc/man1/wimdelete.1 \ + doc/man1/wimdir.1 \ + doc/man1/wimexport.1 \ + doc/man1/wimextract.1 \ + doc/man1/wiminfo.1 \ + doc/man1/wimjoin.1 \ + doc/man1/wimmount.1 \ + doc/man1/wimmountrw.1 \ + doc/man1/wimoptimize.1 \ + doc/man1/wimsplit.1 \ + doc/man1/wimunmount.1 \ + doc/man1/wimupdate.1 \ + doc/man1/wimverify.1 \ doc/man1/mkwinpeimg.1 EXTRA_DIST += $(man1_MANS) @@ -322,11 +314,13 @@ endif EXTRA_DIST += \ tests/common_tests.sh \ - tests/tests-common.sh \ + tests/exclusionlists \ + tests/test_utils.sh \ tests/security_descriptor_1.base64 \ tests/security_descriptor_1.bin \ tests/security_descriptor_2.base64 \ - tests/security_descriptor_2.bin + tests/security_descriptor_2.bin \ + tests/wims if WINDOWS_NATIVE_BUILD # Tests are run manually for Windows builds. @@ -335,4 +329,9 @@ else TESTS = $(dist_check_SCRIPTS) endif +# Extra test programs (not run by 'make check') +EXTRA_PROGRAMS = tests/wlfuzz +tests_wlfuzz_SOURCES = tests/wlfuzz.c +tests_wlfuzz_LDADD = $(top_builddir)/libwim.la + ##############################################################################