X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=ad8be04aca8b8aeadbb0f86f04b206d455c97b92;hp=75ed97168a1f8f8c3d4565235aca651541559b22;hb=db52422f8a9e87e7d160b68b3271d26c41f0687e;hpb=61d4daebb36e567f79f47877b358969b922396d4

diff --git a/Makefile.am b/Makefile.am
index 75ed9716..ad8be04a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,10 +7,15 @@ AM_CFLAGS	= -std=gnu99 -Wmissing-prototypes -Wstrict-prototypes	\
 		  -Werror-implicit-function-declaration			\
 		  -fno-common -Wundef -Wno-pointer-sign
 
+if WINDOWS_NATIVE_BUILD
+# This option is needed to make packed structures work as expected
+# with gcc 4.7+ (mingw) on Windows.
+AM_CFLAGS += -mno-ms-bitfields
+endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 7:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 10:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -40,7 +45,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	\
@@ -63,6 +67,7 @@ libwim_la_SOURCES =		\
 	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		\
@@ -74,8 +79,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		\
@@ -115,11 +120,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)
@@ -138,7 +144,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	\
@@ -147,15 +153,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@"; \
 	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@"; \
+	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