X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=2c94bdcb9288d4daad065fdb5cb070b2f02e5784;hp=75ed97168a1f8f8c3d4565235aca651541559b22;hb=1c1c12926f4de39cb35d8d4c5a5280ab0d6ba931;hpb=61d4daebb36e567f79f47877b358969b922396d4 diff --git a/Makefile.am b/Makefile.am index 75ed9716..2c94bdcb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,45 +7,73 @@ AM_CFLAGS = -std=gnu99 -Wmissing-prototypes -Wstrict-prototypes \ -Werror-implicit-function-declaration \ -fno-common -Wundef -Wno-pointer-sign +if WINDOWS_NATIVE_BUILD +# This option is needed to make packed structures work as expected +# with gcc 4.7+ (mingw) on Windows. +AM_CFLAGS += -mno-ms-bitfields +endif lib_LTLIBRARIES = libwim.la -libwim_la_LDFLAGS = -version-info 7:0:0 $(WINDOWS_LDFLAGS) +libwim_la_LDFLAGS = -version-info 17:0:2 $(WINDOWS_LDFLAGS) libwim_la_SOURCES = \ src/add_image.c \ + src/avl_tree.c \ src/capture_common.c \ src/compress.c \ + src/compress_common.c \ + src/compress_parallel.c \ + src/compress_serial.c \ src/decompress.c \ + src/decompress_common.c \ src/delete_image.c \ src/dentry.c \ + src/divsufsort.c \ src/encoding.c \ src/export_image.c \ src/extract.c \ src/file_io.c \ - src/hardlink.c \ src/header.c \ + src/inode.c \ + src/inode_fixup.c \ src/integrity.c \ + src/iterate_dir.c \ src/join.c \ src/lookup_table.c \ - src/lz77.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/lzx-common.c \ src/lzx-compress.c \ src/lzx-decompress.c \ src/metadata_resource.c \ src/mount_image.c \ + src/pathlist.c \ src/paths.c \ + src/progress.c \ src/resource.c \ - src/rbtree.c \ + src/reference.c \ src/security.c \ src/sha1.c \ src/split.c \ - src/swm.c \ src/reparse.c \ + src/tagged_items.c \ + src/template.c \ + src/textfile.c \ src/timestamp.c \ src/update_image.c \ src/util.c \ src/verify.c \ + src/wildcard.c \ src/wim.c \ src/write.c \ src/xml.c \ @@ -53,33 +81,56 @@ libwim_la_SOURCES = \ src/xpress-decompress.c \ include/wimlib/apply.h \ include/wimlib/assert.h \ + include/wimlib/avl_tree.h \ include/wimlib/callback.h \ include/wimlib/capture.h \ + include/wimlib/case.h \ include/wimlib/compiler.h \ - include/wimlib/compress.h \ - include/wimlib/decompress.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 \ include/wimlib/file_io.h \ + include/wimlib/glob.h \ include/wimlib/header.h \ + include/wimlib/inode.h \ + include/wimlib/inode_table.h \ include/wimlib/integrity.h \ include/wimlib/list.h \ include/wimlib/lookup_table.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/rbtree.h \ + include/wimlib/progress.h \ include/wimlib/reparse.h \ include/wimlib/resource.h \ include/wimlib/security.h \ + include/wimlib/security_descriptor.h \ include/wimlib/sha1.h \ - include/wimlib/swm.h \ + 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 \ include/wimlib/xml.h \ @@ -96,8 +147,11 @@ libwim_la_SOURCES += src/win32_common.c \ src/win32_apply.c \ src/win32_capture.c \ src/win32_replacements.c \ + src/wimboot.c \ include/wimlib/win32_common.h \ - include/wimlib/win32.h + include/wimlib/win32.h \ + include/wimlib/wimboot.h \ + include/wimlib/wof.h else libwim_la_SOURCES += src/unix_apply.c \ src/unix_capture.c @@ -107,22 +161,23 @@ 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_LDADD) \ - $(LIBFUSE_LDADD) \ - $(LIBNTFS_3G_LDADD) \ + $(LIBXML2_LIBS) \ + $(LIBFUSE_LIBS) \ + $(LIBRT_LIBS) \ + $(LIBNTFS_3G_LIBS) \ $(LTLIBICONV) \ - $(LIBCRYPTO_LDADD) \ + $(LIBCRYPTO_LIBS) \ $(SSSE3_SHA1_OBJ) \ - $(PTHREAD_LDADD) \ - $(WINDOWS_LDADD) + $(PTHREAD_LDADD) libwim_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -138,7 +193,7 @@ imagex_SOURCES = programs/imagex.c \ include/wimlib.h \ include/wimlib_tchar.h imagex_LDADD = $(top_builddir)/libwim.la -imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) +imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations if WINDOWS_NATIVE_BUILD imagex_SOURCES += programs/imagex-win32.c \ @@ -147,29 +202,66 @@ imagex_SOURCES += programs/imagex-win32.c \ programs/wgetopt.h endif +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 \ + 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}; \ + done + +install-data-hook: + for cmd in $(imagex_cmds); do \ + cd $(DESTDIR)$(mandir)/man1 && \ + ln -sf "@IMAGEX_PROGNAME@-$${cmd}.1" wim$${cmd}.1; \ + done uninstall-hook: - if [ "@IMAGEX_PROGNAME@" != imagex ]; then \ - cd $(DESTDIR)$(bindir) && rm -f "@IMAGEX_PROGNAME@"; \ + 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}; \ + 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 \ + build-aux/nasm_lt.sh \ archlinux \ debian \ rpm \ examples \ + COPYING \ + COPYING.GPLv3 \ + COPYING.LGPLv3 \ + README \ README.WINDOWS \ - programs/install.cmd \ - programs/wimapply.c \ tests/common_tests.sh \ tests/tests-common.sh \ tests/security_descriptor_1.base64 \ @@ -183,23 +275,24 @@ pkgconfig_DATA = wimlib.pc $(pkgconfig_DATA): config.status wimlib_manpages = \ - doc/@IMAGEX_PROGNAME@.1 \ - doc/@IMAGEX_PROGNAME@-append.1 \ - doc/@IMAGEX_PROGNAME@-apply.1 \ - doc/@IMAGEX_PROGNAME@-capture.1 \ - doc/@IMAGEX_PROGNAME@-delete.1 \ - doc/@IMAGEX_PROGNAME@-dir.1 \ - doc/@IMAGEX_PROGNAME@-export.1 \ - doc/@IMAGEX_PROGNAME@-extract.1 \ - doc/@IMAGEX_PROGNAME@-info.1 \ - doc/@IMAGEX_PROGNAME@-join.1 \ - doc/@IMAGEX_PROGNAME@-mount.1 \ - doc/@IMAGEX_PROGNAME@-mountrw.1 \ - doc/@IMAGEX_PROGNAME@-optimize.1 \ - doc/@IMAGEX_PROGNAME@-split.1 \ - doc/@IMAGEX_PROGNAME@-unmount.1 \ - doc/@IMAGEX_PROGNAME@-update.1 \ - doc/mkwinpeimg.1 + 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 \ + doc/man1/@IMAGEX_PROGNAME@-verify.1 \ + doc/man1/mkwinpeimg.1 man1_MANS = $(wimlib_manpages) DISTCLEANFILES = $(wimlib_manpages)