X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=24c07649cf99cc28246a923227d5fdb5ed95653a;hp=035eda4c04d64ebb83bc0773a46277d39fe80432;hb=670a0ed6a1f36bebf71f0b221f3d78e497d305c2;hpb=9f6a1409c765f07fc4c030d1428461b38898b2bd

diff --git a/Makefile.am b/Makefile.am
index 035eda4c..24c07649 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,42 +1,44 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS	= -I$(top_srcdir)/src
-
-AM_CFLAGS	= -std=gnu99 -D_LARGEFILE_SOURCE \
-		   -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+AM_CPPFLAGS	= -I$(top_srcdir)/src $(WINDOWS_CPPFLAGS) \
+		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+AM_CFLAGS	= -std=gnu99 -fno-strict-aliasing
 
 lib_LTLIBRARIES = libwim.la
 
+libwim_la_LDFLAGS = -version-info 6:0:0 $(WINDOWS_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/rbtree_augmented.h	\
 	src/security.c		\
 	src/security.h		\
 	src/sha1.c		\
@@ -46,16 +48,24 @@ libwim_la_SOURCES =		\
 	src/timestamp.h		\
 	src/util.c		\
 	src/util.h		\
+	src/verify.c		\
 	src/wim.c		\
 	src/wimlib.h		\
+	wimlib_tchar.h		\
 	src/wimlib_internal.h	\
 	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
@@ -72,11 +82,12 @@ libwim_la_LIBADD =		\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LDADD)	\
 	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)
+	$(PTHREAD_LDADD)	\
+	$(WINDOWS_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
-	-fvisibility=hidden	\
+	$(VISIBILITY_CFLAGS)	\
 	$(LIBXML2_CFLAGS)	\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBNTFS_3G_CFLAGS)	\
@@ -84,8 +95,28 @@ libwim_la_CFLAGS =		\
 
 
 bin_PROGRAMS	 = imagex
-imagex_SOURCES   = programs/imagex.c
+imagex_SOURCES   = programs/imagex.c wimlib_tchar.h
 imagex_LDADD	 = $(top_builddir)/libwim.la
+imagex_CFLAGS    = $(AM_CFLAGS) $(WINDOWS_CFLAGS)
+
+if WINDOWS_NATIVE_BUILD
+imagex_SOURCES += programs/imagex-win32.c	\
+		  programs/imagex-win32.h	\
+		  programs/wgetopt.c		\
+		  programs/wgetopt.h
+
+libwim_la_SOURCES += src/win32.c
+endif
+
+install-exec-hook:
+	if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
+		cd $(DESTDIR)$(bindir) && mv -f imagex "@IMAGEX_PROGNAME@"; \
+	fi
+
+uninstall-hook:
+	if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
+		cd $(DESTDIR)$(bindir) && rm -f "@IMAGEX_PROGNAME@"; \
+	fi
 
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
@@ -96,8 +127,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	\
@@ -108,22 +142,26 @@ pkgconfig_DATA	= wimlib.pc
 
 $(pkgconfig_DATA): config.status
 
-man1_MANS =			\
-	doc/imagex.1		\
-	doc/imagex-append.1	\
-	doc/imagex-apply.1	\
-	doc/imagex-capture.1	\
-	doc/imagex-delete.1	\
-	doc/imagex-dir.1	\
-	doc/imagex-export.1	\
-	doc/imagex-info.1	\
-	doc/imagex-join.1	\
-	doc/imagex-mount.1	\
-	doc/imagex-mountrw.1	\
-	doc/imagex-split.1	\
-	doc/imagex-unmount.1	\
+wimlib_manpages =				\
+	doc/@IMAGEX_PROGNAME@.1			\
+	doc/@IMAGEX_PROGNAME@-append.1		\
+	doc/@IMAGEX_PROGNAME@-apply.1		\
+	doc/@IMAGEX_PROGNAME@-capture.1		\
+	doc/@IMAGEX_PROGNAME@-delete.1		\
+	doc/@IMAGEX_PROGNAME@-dir.1		\
+	doc/@IMAGEX_PROGNAME@-export.1		\
+	doc/@IMAGEX_PROGNAME@-info.1		\
+	doc/@IMAGEX_PROGNAME@-join.1		\
+	doc/@IMAGEX_PROGNAME@-mount.1		\
+	doc/@IMAGEX_PROGNAME@-mountrw.1		\
+	doc/@IMAGEX_PROGNAME@-optimize.1	\
+	doc/@IMAGEX_PROGNAME@-split.1		\
+	doc/@IMAGEX_PROGNAME@-unmount.1		\
 	doc/mkwinpeimg.1
 
+man1_MANS = $(wimlib_manpages)
+DISTCLEANFILES = $(wimlib_manpages)
+
 $(man1_MANS): config.status
 
 check_PROGRAMS = tests/tree-cmp
@@ -140,5 +178,10 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+if WINDOWS_NATIVE_BUILD
+# TODO: The tests need to be re-written for Windows builds.
+TESTS =
+else
 TESTS = $(dist_check_SCRIPTS)
+endif