]> wimlib.net Git - wimlib/blobdiff - Makefile.am
tools/windeps: update Windows dependencies Makefile
[wimlib] / Makefile.am
index 0893ef66aa29a826995729b64c293e24ced2ec6a..2987b1004ec2b9aa3a387f3bc28f77b029d31fb5 100644 (file)
@@ -8,7 +8,10 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS    = -I$(top_srcdir)/include $(PLATFORM_CPPFLAGS)  \
                  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-AM_CFLAGS      = -std=c99 $(PLATFORM_CFLAGS) -fno-common       \
+# Note: -std=gnu99 instead of -std=c99 is needed for unnamed structs and unions,
+# which are in C11 but not C99.  But we can't yet actually use -std=c11 because
+# we want to support older versions of gcc.
+AM_CFLAGS      = -std=gnu99 $(PLATFORM_CFLAGS) -fno-common     \
                  -Wmissing-prototypes -Wstrict-prototypes      \
                  -Wundef -Wno-pointer-sign
 
@@ -33,6 +36,7 @@ wimlib.pc: config.status
 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   \
@@ -55,15 +59,7 @@ libwim_la_SOURCES =          \
        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/lcpit_matchfinder.c \
        src/lzms_common.c       \
        src/lzms_compress.c     \
        src/lzms_decompress.c   \
@@ -74,13 +70,16 @@ libwim_la_SOURCES =         \
        src/mount_image.c       \
        src/pathlist.c          \
        src/paths.c             \
+       src/pattern.c           \
        src/progress.c          \
-       src/resource.c          \
        src/reference.c         \
+       src/registry.c          \
+       src/reparse.c           \
+       src/resource.c          \
        src/security.c          \
        src/sha1.c              \
+       src/solid.c             \
        src/split.c             \
-       src/reparse.c           \
        src/tagged_items.c      \
        src/template.c          \
        src/textfile.c          \
@@ -88,22 +87,23 @@ libwim_la_SOURCES =         \
        src/update_image.c      \
        src/util.c              \
        src/verify.c            \
-       src/wildcard.c          \
        src/wim.c               \
        src/write.c             \
+       src/x86_cpu_features.c  \
        src/xml.c               \
+       src/xml_windows.c       \
        src/xpress_compress.c   \
        src/xpress_decompress.c \
+       include/wimlib/alloca.h         \
        include/wimlib/apply.h          \
        include/wimlib/assert.h         \
        include/wimlib/avl_tree.h       \
        include/wimlib/bitops.h         \
+       include/wimlib/blob_table.h     \
        include/wimlib/bt_matchfinder.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       \
@@ -116,47 +116,43 @@ libwim_la_SOURCES =               \
        include/wimlib/error.h          \
        include/wimlib/file_io.h        \
        include/wimlib/glob.h           \
+       include/wimlib/guid.h           \
        include/wimlib/hc_matchfinder.h \
        include/wimlib/header.h         \
        include/wimlib/inode.h          \
        include/wimlib/inode_table.h    \
        include/wimlib/integrity.h      \
+       include/wimlib/lcpit_matchfinder.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/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_avx2.h       \
-       include/wimlib/matchfinder_common.h     \
-       include/wimlib/matchfinder_nonsliding.h \
-       include/wimlib/matchfinder_sliding.h    \
-       include/wimlib/matchfinder_sse2.h       \
        include/wimlib/metadata.h       \
        include/wimlib/pathlist.h       \
        include/wimlib/paths.h          \
+       include/wimlib/pattern.h        \
        include/wimlib/progress.h       \
+       include/wimlib/registry.h       \
        include/wimlib/reparse.h        \
        include/wimlib/resource.h       \
        include/wimlib/security.h       \
        include/wimlib/security_descriptor.h    \
        include/wimlib/sha1.h           \
+       include/wimlib/solid.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/wildcard.h       \
        include/wimlib/wim.h            \
        include/wimlib/write.h          \
+       include/wimlib/x86_cpu_features.h       \
        include/wimlib/xml.h            \
+       include/wimlib/xml_windows.h    \
        include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
@@ -166,14 +162,16 @@ libwim_la_SOURCES += src/ntfs-3g_apply.c  \
 endif
 
 if WINDOWS_NATIVE_BUILD
-libwim_la_SOURCES += src/win32_common.c                        \
+libwim_la_SOURCES += src/wimboot.c                     \
+                    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             \
+                    src/win32_vss.c                    \
                     include/wimlib/wimboot.h           \
+                    include/wimlib/win32.h             \
+                    include/wimlib/win32_common.h      \
+                    include/wimlib/win32_vss.h         \
                     include/wimlib/wof.h
 else
 libwim_la_SOURCES += src/unix_apply.c          \
@@ -188,7 +186,7 @@ libwim_la_CFLAGS =          \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 18:0:3
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 24:0:9
 
 libwim_la_LIBADD =             \
        $(PTHREAD_LIBS)         \
@@ -204,7 +202,7 @@ 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 --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+       $(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  \