X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=23ffcd9c1f3dc362b21823699d5a266c3909ee4e;hp=6feab393f3be127b5f33e75336e7148f278fae51;hb=4464b1da1a79029a88bac8c1490b0be23c2451f0;hpb=02e26e9e4c0c56288a94c8c50e5b05a6da9a48dd diff --git a/Makefile.am b/Makefile.am index 6feab393..23ffcd9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,46 +2,74 @@ 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=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 14:0:5 $(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 \ + src/compress_serial.c \ src/decompress.c \ + src/decompress_common.c \ src/delete_image.c \ src/dentry.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/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 \ src/metadata_resource.c \ src/mount_image.c \ + src/pathlist.c \ src/paths.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/template.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 \ @@ -49,34 +77,48 @@ libwim_la_SOURCES = \ src/xpress-decompress.c \ include/wimlib/apply.h \ include/wimlib/assert.h \ - include/wimlib/buffer_io.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/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.h \ + include/wimlib/lz_hash.h \ + include/wimlib/lz_optimal.h \ + include/wimlib/lz_sarray.h \ + include/wimlib/lzms.h \ include/wimlib/lzx.h \ include/wimlib/metadata.h \ + include/wimlib/pathlist.h \ include/wimlib/paths.h \ - include/wimlib/rbtree.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/timestamp.h \ include/wimlib/types.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 \ @@ -93,8 +135,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 @@ -112,11 +157,12 @@ sha1-ssse3.lo:src/sha1-ssse3.asm $< 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) @@ -135,7 +181,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 \ @@ -144,15 +190,49 @@ 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 + 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 @@ -165,8 +245,6 @@ EXTRA_DIST = \ rpm \ examples \ README.WINDOWS \ - programs/install.cmd \ - programs/wimapply.c \ tests/common_tests.sh \ tests/tests-common.sh \ tests/security_descriptor_1.base64 \