X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=512d2817a0a2b1df569c61c30db29a25ba34f211;hp=0893ef66aa29a826995729b64c293e24ced2ec6a;hb=76b9892785bcdca5d43324f8896fa5ca3c427b1b;hpb=40a690416a3951361ec77d33a723dd4497fb7585

diff --git a/Makefile.am b/Makefile.am
index 0893ef66..512d2817 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
@@ -55,15 +58,8 @@ libwim_la_SOURCES =		\
 	src/integrity.c		\
 	src/iterate_dir.c	\
 	src/join.c		\
+	src/lcpit_matchfinder.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	\
@@ -79,6 +75,7 @@ libwim_la_SOURCES =		\
 	src/reference.c		\
 	src/security.c		\
 	src/sha1.c		\
+	src/solid.c		\
 	src/split.c		\
 	src/reparse.c		\
 	src/tagged_items.c	\
@@ -94,6 +91,7 @@ libwim_la_SOURCES =		\
 	src/xml.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	\
@@ -121,22 +119,17 @@ libwim_la_SOURCES =		\
 	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	\
@@ -147,6 +140,7 @@ libwim_la_SOURCES =		\
 	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		\
@@ -188,7 +182,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 19:0:4
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\