X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=79a91c4c7f257d709c27c484706bf16babfd38f8;hp=56ff24f7a5dd99329591ac3641eeb35c163e6cee;hb=c3648a1bf94a11ee6eff22cb728f0efe3f4500e9;hpb=4659b601e187a5f2f1b150558822fea913b1769d

diff --git a/Makefile.am b/Makefile.am
index 56ff24f7..79a91c4c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,37 @@
+##############################################################################
+#				General					     #
+##############################################################################
+
+
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS	= -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \
+AM_CPPFLAGS	= -I$(top_srcdir)/include $(PLATFORM_CPPFLAGS)	\
 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-AM_CFLAGS	= -std=c99 -Wmissing-prototypes -Wstrict-prototypes	\
-		  -Werror-implicit-function-declaration			\
-		  -fno-common -Wundef -Wno-pointer-sign
+# 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
 
-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
+AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
+
+EXTRA_DIST	= README README.WINDOWS				\
+		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
+		  examples					\
+		  archlinux debian rpm
+
+##############################################################################
+#				Library					     #
+##############################################################################
 
 lib_LTLIBRARIES = libwim.la
+include_HEADERS = include/wimlib.h
 
-libwim_la_LDFLAGS = -version-info 18:0:3 $(WINDOWS_LDFLAGS)
+pkgconfigdir	= @pkgconfigdir@
+pkgconfig_DATA	= wimlib.pc
+wimlib.pc: config.status
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -43,20 +59,17 @@ libwim_la_SOURCES =		\
 	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/lzms-common.c	\
-	src/lzms-compress.c	\
-	src/lzms-decompress.c	\
-	src/lzx-common.c	\
-	src/lzx-compress.c	\
-	src/lzx-decompress.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		\
@@ -79,12 +92,14 @@ libwim_la_SOURCES =		\
 	src/wim.c		\
 	src/write.c		\
 	src/xml.c		\
-	src/xpress-compress.c	\
-	src/xpress-decompress.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/bt_matchfinder.h	\
 	include/wimlib/callback.h	\
 	include/wimlib/capture.h	\
 	include/wimlib/case.h		\
@@ -102,6 +117,7 @@ libwim_la_SOURCES =		\
 	include/wimlib/error.h		\
 	include/wimlib/file_io.h	\
 	include/wimlib/glob.h		\
+	include/wimlib/hc_matchfinder.h	\
 	include/wimlib/header.h		\
 	include/wimlib/inode.h		\
 	include/wimlib/inode_table.h	\
@@ -109,15 +125,18 @@ libwim_la_SOURCES =		\
 	include/wimlib/list.h		\
 	include/wimlib/lookup_table.h	\
 	include/wimlib/lz_extend.h	\
-	include/wimlib/lz_hash3.h	\
+	include/wimlib/lz_hash.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_common.h	\
 	include/wimlib/lzms_constants.h	\
-	include/wimlib/lzx.h		\
+	include/wimlib/lzx_common.h	\
 	include/wimlib/lzx_constants.h	\
+	include/wimlib/matchfinder_avx2.h	\
+	include/wimlib/matchfinder_common.h	\
+	include/wimlib/matchfinder_sse2.h	\
 	include/wimlib/metadata.h	\
 	include/wimlib/pathlist.h	\
 	include/wimlib/paths.h		\
@@ -137,7 +156,7 @@ libwim_la_SOURCES =		\
 	include/wimlib/wim.h		\
 	include/wimlib/write.h		\
 	include/wimlib/xml.h		\
-	include/wimlib/xpress.h
+	include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
 libwim_la_SOURCES += src/ntfs-3g_apply.c	\
@@ -160,44 +179,50 @@ libwim_la_SOURCES += src/unix_apply.c		\
 		     src/unix_capture.c
 endif
 
+libwim_la_CFLAGS =		\
+	$(AM_CFLAGS)		\
+	$(PTHREAD_CFLAGS)	\
+	$(LIBXML2_CFLAGS)	\
+	$(LIBNTFS_3G_CFLAGS)	\
+	$(LIBFUSE_CFLAGS)	\
+	$(LIBCRYPTO_CFLAGS)
 
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 19:0:4
 
-EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
-libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
+libwim_la_LIBADD =		\
+	$(PTHREAD_LIBS)		\
+	$(LIBXML2_LIBS)		\
+	$(LTLIBICONV)		\
+	$(LIBNTFS_3G_LIBS)	\
+	$(LIBFUSE_LIBS)		\
+	$(LIBRT_LIBS)		\
+	$(LIBCRYPTO_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 --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
-	$(NASM) $(NAFLAGS) $(NASM_WINDOWS_FLAGS)			    \
+	$(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 $@
 
-libwim_la_LIBADD =		\
-	$(LIBXML2_LIBS)		\
-	$(LIBFUSE_LIBS)		\
-	$(LIBRT_LIBS)		\
-	$(LIBNTFS_3G_LIBS)	\
-	$(LTLIBICONV)		\
-	$(LIBCRYPTO_LIBS)	\
-	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)
-
-libwim_la_CFLAGS =		\
-	$(AM_CFLAGS)		\
-	$(VISIBILITY_CFLAGS)	\
-	$(LIBXML2_CFLAGS)	\
-	$(LIBFUSE_CFLAGS)	\
-	$(LIBNTFS_3G_CFLAGS)	\
-	$(LIBCRYPTO_CFLAGS)
+EXTRA_DIST += build-aux/nasm_lt.sh
+endif
 
+##############################################################################
+#				Programs				     #
+##############################################################################
 
 bin_PROGRAMS = wimlib-imagex
+dist_bin_SCRIPTS = programs/mkwinpeimg
+
 wimlib_imagex_SOURCES =		\
 	programs/imagex.c	\
 	include/wimlib.h	\
 	include/wimlib_tchar.h
-wimlib_imagex_LDADD = $(top_builddir)/libwim.la
-wimlib_imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations
 
 if WINDOWS_NATIVE_BUILD
 wimlib_imagex_SOURCES +=	\
@@ -207,6 +232,10 @@ wimlib_imagex_SOURCES +=	\
 	programs/wgetopt.h
 endif
 
+wimlib_imagex_CFLAGS = $(AM_CFLAGS) -Wno-deprecated-declarations
+
+wimlib_imagex_LDADD = $(top_builddir)/libwim.la
+
 wimlib_imagex_cmds =	\
 	append		\
 	apply		\
@@ -225,6 +254,10 @@ wimlib_imagex_cmds =	\
 	update		\
 	verify
 
+##############################################################################
+#				  Hooks					     #
+##############################################################################
+
 install-exec-hook:
 	for cmd in $(wimlib_imagex_cmds); do				\
 		cd $(DESTDIR)$(bindir) &&				\
@@ -240,36 +273,12 @@ install-data-hook:
 uninstall-hook:
 	for cmd in $(wimlib_imagex_cmds); do				\
 		rm -f $(DESTDIR)$(bindir)/wim$${cmd};			\
-		rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1; 		\
+		rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1;		\
 	done
 
-dist_bin_SCRIPTS = programs/mkwinpeimg
-
-include_HEADERS = include/wimlib.h
-
-EXTRA_DIST =					\
-	$(man1_MANS)				\
-	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			\
-	tests/security_descriptor_1.base64	\
-	tests/security_descriptor_1.bin		\
-	tests/security_descriptor_2.base64	\
-	tests/security_descriptor_2.bin
-
-pkgconfigdir	= @pkgconfigdir@
-pkgconfig_DATA	= wimlib.pc
-
-$(pkgconfig_DATA): config.status
+##############################################################################
+#				Documentation				     #
+##############################################################################
 
 man1_MANS =					\
 	doc/man1/wimlib-imagex.1		\
@@ -291,6 +300,12 @@ man1_MANS =					\
 	doc/man1/wimlib-imagex-verify.1		\
 	doc/man1/mkwinpeimg.1
 
+EXTRA_DIST += $(man1_MANS)
+
+##############################################################################
+#				  Tests					     #
+##############################################################################
+
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
@@ -306,6 +321,14 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+EXTRA_DIST +=					\
+	tests/common_tests.sh			\
+	tests/tests-common.sh			\
+	tests/security_descriptor_1.base64	\
+	tests/security_descriptor_1.bin		\
+	tests/security_descriptor_2.base64	\
+	tests/security_descriptor_2.bin
+
 if WINDOWS_NATIVE_BUILD
 # Tests are run manually for Windows builds.
 TESTS =
@@ -313,3 +336,4 @@ else
 TESTS = $(dist_check_SCRIPTS)
 endif
 
+##############################################################################