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

diff --git a/Makefile.am b/Makefile.am
index 5dc694b7..1ba1c796 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,12 @@
 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 $(WINDOWS_EXTRA_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 6:0:0 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -45,15 +44,15 @@ libwim_la_SOURCES =		\
 	src/sha1.c		\
 	src/sha1.h		\
 	src/split.c		\
-	src/symlink.c		\
+	src/reparse.c		\
 	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/win32.c		\
 	src/write.c		\
 	src/xml.c		\
 	src/xml.h		\
@@ -96,13 +95,29 @@ 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
 
-if WINDOWS_BUILD
-imagex_SOURCES += programs/imagex-win32.c programs/imagex-win32.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
 
 include_HEADERS = src/wimlib.h
@@ -127,23 +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-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@-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
@@ -160,13 +178,10 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
-if WINDOWS_BUILD
+if WINDOWS_NATIVE_BUILD
+# TODO: The tests need to be re-written for Windows builds.
 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