X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=2e1298b6bf8f3f9e94fef248cc4afff118d69be3;hp=b3abad47683fe4c451d47350d34071c61b380505;hb=33413e379625e3ea9b462d11a2f74d04da28747c;hpb=b7071062542143113ad654d89ee6b0603b23b524 diff --git a/Makefile.am b/Makefile.am index b3abad47..2e1298b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ endif lib_LTLIBRARIES = libwim.la -libwim_la_LDFLAGS = -version-info 15:0:0 $(WINDOWS_LDFLAGS) +libwim_la_LDFLAGS = -version-info 16:0:1 $(WINDOWS_LDFLAGS) libwim_la_SOURCES = \ src/add_image.c \ @@ -146,12 +146,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) \ @@ -236,11 +237,15 @@ 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 \ tests/common_tests.sh \ tests/tests-common.sh \