X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=d784d46a9949e3102976956457c58e0b4142becc;hb=f5f94b14f4f353a0ee425b1c3b5c667f789f8996;hp=391b09ca96bb1f7518582e08f46c62d355579476;hpb=571e0b066fe7526690d68a5223d1025604c6e48b;p=wimlib diff --git a/Makefile.am b/Makefile.am index 391b09ca..d784d46a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,8 +17,8 @@ AM_CFLAGS = -std=gnu99 $(PLATFORM_CFLAGS) -fno-common \ AM_LDFLAGS = $(PLATFORM_LDFLAGS) -EXTRA_DIST = README README.WINDOWS \ - COPYING COPYING.GPLv3 COPYING.LGPLv3 COPYING.CC0 \ +EXTRA_DIST = README README.WINDOWS \ + COPYING COPYING.GPLv3 COPYING.LGPLv3 \ examples ############################################################################## @@ -40,6 +40,7 @@ libwim_la_SOURCES = \ 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 \ @@ -82,15 +83,16 @@ libwim_la_SOURCES = \ src/tagged_items.c \ src/template.c \ src/textfile.c \ + src/threads.c \ src/timestamp.c \ src/update_image.c \ src/util.c \ src/verify.c \ src/wim.c \ src/write.c \ - src/x86_cpu_features.c \ src/xml.c \ src/xml_windows.c \ + src/xmlproc.c \ src/xpress_compress.c \ src/xpress_decompress.c \ include/wimlib/alloca.h \ @@ -105,6 +107,7 @@ libwim_la_SOURCES = \ 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 \ @@ -122,12 +125,11 @@ 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 \ @@ -144,6 +146,7 @@ libwim_la_SOURCES = \ include/wimlib/solid.h \ include/wimlib/tagged_items.h \ include/wimlib/textfile.h \ + include/wimlib/threads.h \ include/wimlib/timestamp.h \ include/wimlib/types.h \ include/wimlib/unaligned.h \ @@ -151,10 +154,10 @@ 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/xmlproc.h \ include/wimlib/xpress_constants.h if WITH_NTFS_3G @@ -175,7 +178,7 @@ libwim_la_SOURCES += src/wimboot.c \ include/wimlib/win32_common.h \ include/wimlib/win32_vss.h \ include/wimlib/wof.h -PLATFORM_LIBS = -lmsvcrt -lntdll +PLATFORM_LIBS = -lntdll else libwim_la_SOURCES += src/unix_apply.c \ src/unix_capture.c @@ -185,45 +188,23 @@ endif if ENABLE_TEST_SUPPORT libwim_la_SOURCES += src/test_support.c \ include/wimlib/test_support.h -if WINDOWS_NATIVE_BUILD -# Workaround for "multiple definition" error when math symbols are present in -# both libmsvcrt.a and ntdll.a -AM_LDFLAGS += -Wl,--allow-multiple-definition -endif endif libwim_la_CFLAGS = \ $(AM_CFLAGS) \ $(PTHREAD_CFLAGS) \ - $(LIBXML2_CFLAGS) \ $(LIBNTFS_3G_CFLAGS) \ - $(LIBFUSE_CFLAGS) \ - $(LIBCRYPTO_CFLAGS) + $(LIBFUSE_CFLAGS) -libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 33:0:18 +libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 36:0:21 libwim_la_LIBADD = \ $(PTHREAD_LIBS) \ - $(LIBXML2_LIBS) \ $(LIBNTFS_3G_LIBS) \ $(LIBFUSE_LIBS) \ $(LIBRT_LIBS) \ - $(LIBCRYPTO_LIBS) \ $(PLATFORM_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 $@ -endif -EXTRA_DIST += build-aux/nasm_lt.sh - ############################################################################## # Programs # ##############################################################################