X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=7b20b58a9bda9790b66bdc04c827e28f81207c43;hp=f18a5ce0529ebb354bbe70286d620e8588f07589;hb=7bac2f53ecca0fe8d6f9e55a9bf8f86512256660;hpb=7ed55e914b616c71e3118ca9948c1350441a9fc2

diff --git a/Makefile.am b/Makefile.am
index f18a5ce0..7b20b58a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,15 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 8:0:1 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 11:0:2 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
 	src/capture_common.c	\
 	src/compress.c		\
+	src/compress_chunk.c	\
+	src/compress_parallel.c	\
+	src/compress_serial.c	\
 	src/decompress.c	\
 	src/delete_image.c	\
 	src/dentry.c		\
@@ -33,7 +36,13 @@ libwim_la_SOURCES =		\
 	src/integrity.c		\
 	src/join.c		\
 	src/lookup_table.c	\
+	src/lzms-decompress.c	\
 	src/lz77.c		\
+	src/divsufsort/divsufsort.c		\
+	src/divsufsort/divsufsort.h		\
+	src/divsufsort/divsufsort_private.h	\
+	src/divsufsort/sssort.c	\
+	src/divsufsort/trsort.c	\
 	src/lzx-common.c	\
 	src/lzx-compress.c	\
 	src/lzx-decompress.c	\
@@ -45,7 +54,6 @@ libwim_la_SOURCES =		\
 	src/security.c		\
 	src/sha1.c		\
 	src/split.c		\
-	src/swm.c		\
 	src/reparse.c		\
 	src/timestamp.c		\
 	src/update_image.c	\
@@ -62,16 +70,19 @@ libwim_la_SOURCES =		\
 	include/wimlib/capture.h	\
 	include/wimlib/compiler.h	\
 	include/wimlib/compress.h	\
+	include/wimlib/compress_chunks.h \
 	include/wimlib/decompress.h	\
 	include/wimlib/dentry.h		\
 	include/wimlib/encoding.h	\
 	include/wimlib/endianness.h	\
 	include/wimlib/error.h		\
 	include/wimlib/file_io.h	\
+	include/wimlib/glob.h		\
 	include/wimlib/header.h		\
 	include/wimlib/integrity.h	\
 	include/wimlib/list.h		\
 	include/wimlib/lookup_table.h	\
+	include/wimlib/lzms.h		\
 	include/wimlib/lzx.h		\
 	include/wimlib/metadata.h	\
 	include/wimlib/paths.h		\
@@ -79,8 +90,8 @@ libwim_la_SOURCES =		\
 	include/wimlib/reparse.h	\
 	include/wimlib/resource.h	\
 	include/wimlib/security.h	\
+	include/wimlib/security_descriptor.h	\
 	include/wimlib/sha1.h		\
-	include/wimlib/swm.h		\
 	include/wimlib/timestamp.h	\
 	include/wimlib/types.h		\
 	include/wimlib/util.h		\
@@ -120,11 +131,12 @@ sha1-ssse3.lo:src/sha1-ssse3.asm
 	$<
 
 libwim_la_LIBADD =		\
-	$(LIBXML2_LDADD)	\
-	$(LIBFUSE_LDADD)	\
-	$(LIBNTFS_3G_LDADD)	\
+	$(LIBXML2_LIBS)		\
+	$(LIBFUSE_LIBS)		\
+	$(LIBRT_LIBS)		\
+	$(LIBNTFS_3G_LIBS)	\
 	$(LTLIBICONV)		\
-	$(LIBCRYPTO_LDADD)	\
+	$(LIBCRYPTO_LIBS)	\
 	$(SSSE3_SHA1_OBJ)	\
 	$(PTHREAD_LDADD)	\
 	$(WINDOWS_LDADD)
@@ -143,7 +155,7 @@ imagex_SOURCES   = programs/imagex.c	\
 		   include/wimlib.h	\
 		   include/wimlib_tchar.h
 imagex_LDADD	 = $(top_builddir)/libwim.la
-imagex_CFLAGS    = $(AM_CFLAGS) $(WINDOWS_CFLAGS)
+imagex_CFLAGS    = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations
 
 if WINDOWS_NATIVE_BUILD
 imagex_SOURCES += programs/imagex-win32.c	\
@@ -152,17 +164,49 @@ imagex_SOURCES += programs/imagex-win32.c	\
 		  programs/wgetopt.h
 endif
 
+imagex_cmds =	append	\
+		apply	\
+		capture	\
+		delete	\
+		dir	\
+		export	\
+		extract	\
+		info	\
+		join	\
+		mount	\
+		mountrw	\
+		optimize\
+		split	\
+		unmount	\
+		update
+
 install-exec-hook:
-	if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
+	if [ "@IMAGEX_PROGNAME@" != imagex ]; then			    \
 		cd $(DESTDIR)$(bindir) && mv -f imagex "@IMAGEX_PROGNAME@"; \
-		cd $(DESTDIR)$(bindir) && ln -s "@IMAGEX_PROGNAME@" imagex; \
 	fi
+	for cmd in $(imagex_cmds); do				\
+		cd $(DESTDIR)$(bindir) &&			\
+			ln -f "@IMAGEX_PROGNAME@" wim$${cmd};	\
+	done
+
+install-data-hook:
+	for cmd in $(imagex_cmds); do					    \
+		cd $(DESTDIR)$(mandir)/man1 &&				    \
+			ln -sf "@IMAGEX_PROGNAME@-$${cmd}.1" wim$${cmd}.1;  \
+	done
 
 uninstall-hook:
-	if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
-		cd $(DESTDIR)$(bindir) && rm -f "@IMAGEX_PROGNAME@"; \
-		cd $(DESTDIR)$(bindir) && rm -f imagex;	\
+	if [ "@IMAGEX_PROGNAME@" != imagex ]; then		\
+		rm -f $(DESTDIR)$(bindir)/"@IMAGEX_PROGNAME@";	\
+		rm -f $(DESTDIR)$(bindir)/imagex;		\
 	fi
+	for cmd in $(imagex_cmds); do				\
+		rm -f $(DESTDIR)$(bindir)/wim$${cmd};		\
+	done
+	for cmd in $(imagex_cmds); do				\
+		rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1; 	\
+	done
+
 
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
@@ -175,8 +219,6 @@ EXTRA_DIST =					\
 	rpm					\
 	examples				\
 	README.WINDOWS				\
-	programs/install.cmd			\
-	programs/wimapply.c			\
 	tests/common_tests.sh			\
 	tests/tests-common.sh			\
 	tests/security_descriptor_1.base64	\