X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=56ff24f7a5dd99329591ac3641eeb35c163e6cee;hb=4659b601e187a5f2f1b150558822fea913b1769d;hp=a9206fdf9ff39f062e9df2f634ea3964859f6908;hpb=864db0e0929d60b33b8b0df35ccb68d43e7f8684;p=wimlib diff --git a/Makefile.am b/Makefile.am index a9206fdf..56ff24f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -AM_CFLAGS = -std=gnu99 -Wmissing-prototypes -Wstrict-prototypes \ +AM_CFLAGS = -std=c99 -Wmissing-prototypes -Wstrict-prototypes \ -Werror-implicit-function-declaration \ -fno-common -Wundef -Wno-pointer-sign @@ -15,13 +15,12 @@ endif lib_LTLIBRARIES = libwim.la -libwim_la_LDFLAGS = -version-info 15:0:0 $(WINDOWS_LDFLAGS) +libwim_la_LDFLAGS = -version-info 18:0:3 $(WINDOWS_LDFLAGS) libwim_la_SOURCES = \ src/add_image.c \ src/avl_tree.c \ src/capture_common.c \ - src/compat.c \ src/compress.c \ src/compress_common.c \ src/compress_parallel.c \ @@ -30,27 +29,31 @@ libwim_la_SOURCES = \ src/decompress_common.c \ src/delete_image.c \ src/dentry.c \ + src/divsufsort.c \ src/encoding.c \ + src/error.c \ src/export_image.c \ src/extract.c \ src/file_io.c \ src/header.c \ src/inode.c \ src/inode_fixup.c \ + src/inode_table.c \ src/integrity.c \ src/iterate_dir.c \ src/join.c \ src/lookup_table.c \ + src/lz_binary_trees.c \ + src/lz_hash_chains.c \ + src/lz_lcp_interval_tree.c \ + src/lz_linked_suffix_array.c \ + src/lz_mf.c \ + src/lz_null.c \ + src/lz_repsearch.c \ + src/lz_suffix_array_utils.c \ src/lzms-common.c \ src/lzms-compress.c \ src/lzms-decompress.c \ - src/lz_hash.c \ - src/lz_sarray.c \ - src/divsufsort/divsufsort.c \ - src/divsufsort/divsufsort.h \ - src/divsufsort/divsufsort_private.h \ - src/divsufsort/sssort.c \ - src/divsufsort/trsort.c \ src/lzx-common.c \ src/lzx-compress.c \ src/lzx-decompress.c \ @@ -58,12 +61,14 @@ libwim_la_SOURCES = \ src/mount_image.c \ src/pathlist.c \ src/paths.c \ + src/progress.c \ src/resource.c \ src/reference.c \ src/security.c \ src/sha1.c \ src/split.c \ src/reparse.c \ + src/tagged_items.c \ src/template.c \ src/textfile.c \ src/timestamp.c \ @@ -79,16 +84,19 @@ libwim_la_SOURCES = \ include/wimlib/apply.h \ include/wimlib/assert.h \ include/wimlib/avl_tree.h \ + include/wimlib/bitops.h \ include/wimlib/callback.h \ include/wimlib/capture.h \ include/wimlib/case.h \ include/wimlib/compiler.h \ + include/wimlib/compiler-gcc.h \ include/wimlib/compressor_ops.h \ include/wimlib/compress_common.h \ include/wimlib/chunk_compressor.h \ include/wimlib/decompressor_ops.h \ include/wimlib/decompress_common.h \ include/wimlib/dentry.h \ + include/wimlib/divsufsort.h \ include/wimlib/encoding.h \ include/wimlib/endianness.h \ include/wimlib/error.h \ @@ -100,15 +108,20 @@ libwim_la_SOURCES = \ include/wimlib/integrity.h \ include/wimlib/list.h \ include/wimlib/lookup_table.h \ - include/wimlib/lz.h \ - include/wimlib/lz_hash.h \ - include/wimlib/lz_optimal.h \ - include/wimlib/lz_sarray.h \ + include/wimlib/lz_extend.h \ + include/wimlib/lz_hash3.h \ + include/wimlib/lz_mf.h \ + include/wimlib/lz_mf_ops.h \ + include/wimlib/lz_repsearch.h \ + include/wimlib/lz_suffix_array_utils.h \ include/wimlib/lzms.h \ + include/wimlib/lzms_constants.h \ include/wimlib/lzx.h \ + include/wimlib/lzx_constants.h \ include/wimlib/metadata.h \ include/wimlib/pathlist.h \ include/wimlib/paths.h \ + include/wimlib/progress.h \ include/wimlib/reparse.h \ include/wimlib/resource.h \ include/wimlib/security.h \ @@ -117,9 +130,9 @@ libwim_la_SOURCES = \ include/wimlib/textfile.h \ include/wimlib/timestamp.h \ include/wimlib/types.h \ + include/wimlib/unaligned.h \ include/wimlib/unix_data.h \ include/wimlib/util.h \ - include/wimlib/version.h \ include/wimlib/wildcard.h \ include/wimlib/wim.h \ include/wimlib/write.h \ @@ -151,12 +164,13 @@ 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 -sha1-ssse3.lo:src/sha1-ssse3.asm - $(LIBTOOL) --mode=compile --tag=CC $(STRIP_FPIC) $(NASM) -f elf64 \ - -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=ssse3_not_found \ - $< +src/sha1-ssse3.lo:src/sha1-ssse3.asm + $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \ + $(NASM) $(NAFLAGS) $(NASM_WINDOWS_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 $@ libwim_la_LIBADD = \ $(LIBXML2_LIBS) \ @@ -166,8 +180,7 @@ libwim_la_LIBADD = \ $(LTLIBICONV) \ $(LIBCRYPTO_LIBS) \ $(SSSE3_SHA1_OBJ) \ - $(PTHREAD_LDADD) \ - $(WINDOWS_LDADD) + $(PTHREAD_LDADD) libwim_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -178,74 +191,73 @@ libwim_la_CFLAGS = \ $(LIBCRYPTO_CFLAGS) -bin_PROGRAMS = imagex -imagex_SOURCES = programs/imagex.c \ - include/wimlib.h \ - include/wimlib_tchar.h -imagex_LDADD = $(top_builddir)/libwim.la -imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations +bin_PROGRAMS = wimlib-imagex +wimlib_imagex_SOURCES = \ + programs/imagex.c \ + include/wimlib.h \ + include/wimlib_tchar.h +wimlib_imagex_LDADD = $(top_builddir)/libwim.la +wimlib_imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations if WINDOWS_NATIVE_BUILD -imagex_SOURCES += programs/imagex-win32.c \ - programs/imagex-win32.h \ - programs/wgetopt.c \ - programs/wgetopt.h +wimlib_imagex_SOURCES += \ + programs/imagex-win32.c \ + programs/imagex-win32.h \ + programs/wgetopt.c \ + programs/wgetopt.h endif -imagex_cmds = append \ - apply \ - capture \ - delete \ - dir \ - export \ - extract \ - info \ - join \ - mount \ - mountrw \ - optimize\ - split \ - unmount \ - update +wimlib_imagex_cmds = \ + append \ + apply \ + capture \ + delete \ + dir \ + export \ + extract \ + info \ + join \ + mount \ + mountrw \ + optimize \ + split \ + unmount \ + update \ + verify install-exec-hook: - if [ "@IMAGEX_PROGNAME@" != imagex ]; then \ - cd $(DESTDIR)$(bindir) && mv -f imagex "@IMAGEX_PROGNAME@"; \ - fi - for cmd in $(imagex_cmds); do \ - cd $(DESTDIR)$(bindir) && \ - ln -f "@IMAGEX_PROGNAME@" wim$${cmd}; \ + for cmd in $(wimlib_imagex_cmds); do \ + cd $(DESTDIR)$(bindir) && \ + ln -f wimlib-imagex wim$${cmd}; \ done install-data-hook: - for cmd in $(imagex_cmds); do \ - cd $(DESTDIR)$(mandir)/man1 && \ - ln -sf "@IMAGEX_PROGNAME@-$${cmd}.1" wim$${cmd}.1; \ + for cmd in $(wimlib_imagex_cmds); do \ + cd $(DESTDIR)$(mandir)/man1 && \ + ln -sf wimlib-imagex-$${cmd}.1 wim$${cmd}.1; \ done uninstall-hook: - if [ "@IMAGEX_PROGNAME@" != imagex ]; then \ - rm -f $(DESTDIR)$(bindir)/"@IMAGEX_PROGNAME@"; \ - rm -f $(DESTDIR)$(bindir)/imagex; \ - fi - for cmd in $(imagex_cmds); do \ - rm -f $(DESTDIR)$(bindir)/wim$${cmd}; \ + for cmd in $(wimlib_imagex_cmds); do \ + rm -f $(DESTDIR)$(bindir)/wim$${cmd}; \ + rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1; \ done - for cmd in $(imagex_cmds); do \ - rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1; \ - done - dist_bin_SCRIPTS = programs/mkwinpeimg include_HEADERS = include/wimlib.h EXTRA_DIST = \ - build-aux/strip_fPIC.sh \ + $(man1_MANS) \ + build-aux/nasm_lt.sh \ archlinux \ debian \ rpm \ examples \ + COPYING \ + COPYING.GPLv3 \ + COPYING.LGPLv3 \ + README \ README.WINDOWS \ tests/common_tests.sh \ tests/tests-common.sh \ @@ -259,30 +271,26 @@ pkgconfig_DATA = wimlib.pc $(pkgconfig_DATA): config.status -wimlib_manpages = \ - doc/man1/@IMAGEX_PROGNAME@.1 \ - doc/man1/@IMAGEX_PROGNAME@-append.1 \ - doc/man1/@IMAGEX_PROGNAME@-apply.1 \ - doc/man1/@IMAGEX_PROGNAME@-capture.1 \ - doc/man1/@IMAGEX_PROGNAME@-delete.1 \ - doc/man1/@IMAGEX_PROGNAME@-dir.1 \ - doc/man1/@IMAGEX_PROGNAME@-export.1 \ - doc/man1/@IMAGEX_PROGNAME@-extract.1 \ - doc/man1/@IMAGEX_PROGNAME@-info.1 \ - doc/man1/@IMAGEX_PROGNAME@-join.1 \ - doc/man1/@IMAGEX_PROGNAME@-mount.1 \ - doc/man1/@IMAGEX_PROGNAME@-mountrw.1 \ - doc/man1/@IMAGEX_PROGNAME@-optimize.1 \ - doc/man1/@IMAGEX_PROGNAME@-split.1 \ - doc/man1/@IMAGEX_PROGNAME@-unmount.1 \ - doc/man1/@IMAGEX_PROGNAME@-update.1 \ +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 \ doc/man1/mkwinpeimg.1 -man1_MANS = $(wimlib_manpages) -DISTCLEANFILES = $(wimlib_manpages) - -$(man1_MANS): config.status - check_PROGRAMS = tests/tree-cmp tests_tree_cmp_SOURCES = tests/tree-cmp.c