X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=0aede5918141e3e181bfcfa733c6f80c9565cbb2;hp=1e545bb14fa661cdf1c0f0b0d471242c66dd462f;hb=be1dad10f323cd02d882ae3950e98260043a0bc9;hpb=33d977b0e1cc13323340fc6a29825570dbf833da

diff --git a/Makefile.am b/Makefile.am
index 1e545bb1..0aede591 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,17 @@
 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 4:0:2
+libwim_la_LDFLAGS = -version-info 7:0:0 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
 	src/buffer_io.h		\
+	src/capture_common.c	\
 	src/compress.c		\
 	src/compress.h		\
 	src/decompress.c	\
@@ -45,13 +45,15 @@ libwim_la_SOURCES =		\
 	src/sha1.c		\
 	src/sha1.h		\
 	src/split.c		\
-	src/symlink.c		\
+	src/reparse.c		\
 	src/timestamp.h		\
+	src/update_image.c	\
 	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		\
@@ -82,11 +84,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)	\
@@ -94,8 +97,35 @@ 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_common.c		\
+		     src/win32_apply.c		\
+		     src/win32_capture.c	\
+		     src/win32.h		\
+		     src/win32_common.h
+else
+libwim_la_SOURCES += src/unix_apply.c		\
+		     src/unix_capture.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
 
@@ -106,6 +136,7 @@ EXTRA_DIST =					\
 	archlinux				\
 	debian					\
 	rpm					\
+	README.WINDOWS				\
 	programs/install.cmd			\
 	programs/wimapply.c			\
 	tests/common_tests.sh			\
@@ -120,30 +151,36 @@ 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-optimize.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@-extract.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/@IMAGEX_PROGNAME@-update.1		\
 	doc/mkwinpeimg.1
 
+man1_MANS = $(wimlib_manpages)
+DISTCLEANFILES = $(wimlib_manpages)
+
 $(man1_MANS): config.status
 
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
 dist_check_SCRIPTS = tests/test-imagex \
-		     tests/test-imagex-capture_and_apply
+		     tests/test-imagex-capture_and_apply \
+		     tests/test-imagex-update_and_extract
 
 if WITH_FUSE
 dist_check_SCRIPTS += tests/test-imagex-mount
@@ -153,5 +190,10 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+if WINDOWS_NATIVE_BUILD
+# Tests are run manually for Windows builds.
+TESTS =
+else
 TESTS = $(dist_check_SCRIPTS)
+endif