X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=2987b1004ec2b9aa3a387f3bc28f77b029d31fb5;hb=43a5725a59b3e5a55ba41ffe988b9bc9430225a4;hp=8ee8e8bc66ce07ff344e6a1284e9698e842694e6;hpb=b8efa8686896d10fe2b2287eabc85d5a470c8202;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 8ee8e8bc..2987b100 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,13 +72,14 @@ libwim_la_SOURCES =		\
 	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		\
@@ -90,6 +91,7 @@ libwim_la_SOURCES =		\
 	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		\
@@ -102,7 +104,6 @@ libwim_la_SOURCES =		\
 	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	\
@@ -134,6 +135,7 @@ libwim_la_SOURCES =		\
 	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	\
@@ -150,6 +152,7 @@ libwim_la_SOURCES =		\
 	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
@@ -159,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		\
@@ -181,7 +186,7 @@ libwim_la_CFLAGS =		\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 23:0:8
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 24:0:9
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\
@@ -197,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  \