X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=5dc694b7ccd49cc9bb3714e329291e63aa1e1d09;hp=3ca49aa3fef701d947d91d1fbb3462e2921d0034;hb=2a33c303e30fd740f740e21632fd06b9e414b0c7;hpb=af49967039a06dd49347f48152122a3f6cee6419

diff --git a/Makefile.am b/Makefile.am
index 3ca49aa3..5dc694b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,33 +7,39 @@ AM_CFLAGS	= -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
+libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_EXTRA_LDFLAGS)
+
 libwim_la_SOURCES =		\
-	src/comp.c		\
-	src/comp.h		\
-	src/decomp.c		\
-	src/decomp.h		\
+	src/add_image.c		\
+	src/buffer_io.h		\
+	src/compress.c		\
+	src/compress.h		\
+	src/decompress.c	\
+	src/decompress.h	\
+	src/delete_image.c	\
 	src/dentry.c		\
 	src/dentry.h		\
+	src/encoding.c		\
 	src/endianness.h	\
-	src/extract.c		\
+	src/export_image.c	\
+	src/extract_image.c	\
 	src/hardlink.c		\
 	src/header.c		\
 	src/integrity.c		\
-	src/io.h		\
 	src/join.c		\
 	src/list.h		\
 	src/lookup_table.c	\
 	src/lookup_table.h	\
-	src/lz.c		\
+	src/lz77.c		\
 	src/lzx-common.c	\
-	src/lzx-comp.c		\
-	src/lzx-decomp.c	\
+	src/lzx-compress.c	\
+	src/lzx-decompress.c	\
 	src/lzx.h		\
-	src/modify.c		\
-	src/mount.c		\
-	src/ntfs-apply.c	\
-	src/ntfs-capture.c	\
+	src/metadata_resource.c	\
+	src/mount_image.c	\
 	src/resource.c		\
+	src/rbtree.c		\
+	src/rbtree.h		\
 	src/security.c		\
 	src/security.h		\
 	src/sha1.c		\
@@ -43,16 +49,24 @@ libwim_la_SOURCES =		\
 	src/timestamp.h		\
 	src/util.c		\
 	src/util.h		\
+	src/verify.c		\
 	src/wim.c		\
 	src/wimlib.h		\
 	src/wimlib_internal.h	\
+	src/win32.c		\
 	src/write.c		\
 	src/xml.c		\
 	src/xml.h		\
-	src/xpress-comp.c	\
-	src/xpress-decomp.c	\
+	src/xpress-compress.c	\
+	src/xpress-decompress.c	\
 	src/xpress.h
 
+if WITH_NTFS_3G
+libwim_la_SOURCES += src/ntfs-apply.c	\
+		     src/ntfs-capture.c
+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
@@ -68,11 +82,13 @@ libwim_la_LIBADD =		\
 	$(LIBNTFS_3G_LDADD)	\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LDADD)	\
-	$(SSSE3_SHA1_OBJ)
+	$(SSSE3_SHA1_OBJ)	\
+	$(PTHREAD_LDADD)	\
+	$(WINDOWS_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
-	-fvisibility=hidden	\
+	$(VISIBILITY_CFLAGS)	\
 	$(LIBXML2_CFLAGS)	\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBNTFS_3G_CFLAGS)	\
@@ -83,6 +99,10 @@ bin_PROGRAMS	 = imagex
 imagex_SOURCES   = programs/imagex.c
 imagex_LDADD	 = $(top_builddir)/libwim.la
 
+if WINDOWS_BUILD
+imagex_SOURCES += programs/imagex-win32.c programs/imagex-win32.h
+endif
+
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
@@ -92,8 +112,11 @@ EXTRA_DIST =					\
 	archlinux				\
 	debian					\
 	rpm					\
+	README.WINDOWS				\
 	programs/install.cmd			\
+	programs/wimapply.c			\
 	tests/common_tests.sh			\
+	tests/tests-common.sh			\
 	tests/security_descriptor_1.base64	\
 	tests/security_descriptor_1.bin		\
 	tests/security_descriptor_2.base64	\
@@ -116,6 +139,7 @@ man1_MANS =			\
 	doc/imagex-join.1	\
 	doc/imagex-mount.1	\
 	doc/imagex-mountrw.1	\
+	doc/imagex-optimize.1	\
 	doc/imagex-split.1	\
 	doc/imagex-unmount.1	\
 	doc/mkwinpeimg.1
@@ -136,5 +160,13 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+if WINDOWS_BUILD
+TESTS =
+else
+# TODO: The tests need to be re-written for Windows builds.  One issue (that
+# applies to both test-imagex and test-imagex-capture_and_apply) is that
+# Cygwin's 'ln -s' will create some sort of regular file with special contents
+# rather than a reparse point.
 TESTS = $(dist_check_SCRIPTS)
+endif