X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=Makefile.am;h=f18a5ce0529ebb354bbe70286d620e8588f07589;hb=bcec8f6839a4e72db751bb8fd5d7559e1cd7ea7f;hp=babc014f09ebdc5ead5f4efcf9242c04813c51d3;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index babc014f..f18a5ce0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,20 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_CPPFLAGS	= -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \
 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-AM_CFLAGS	= -std=gnu99 -fno-strict-aliasing \
-		  -Wmissing-prototypes -Wstrict-prototypes
+
+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 8:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -37,6 +45,7 @@ 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	\
@@ -49,7 +58,6 @@ libwim_la_SOURCES =		\
 	src/xpress-decompress.c \
 	include/wimlib/apply.h		\
 	include/wimlib/assert.h		\
-	include/wimlib/buffer_io.h	\
 	include/wimlib/callback.h	\
 	include/wimlib/capture.h	\
 	include/wimlib/compiler.h	\
@@ -66,7 +74,6 @@ libwim_la_SOURCES =		\
 	include/wimlib/lookup_table.h	\
 	include/wimlib/lzx.h		\
 	include/wimlib/metadata.h	\
-	include/wimlib/ntfs_3g.h	\
 	include/wimlib/paths.h		\
 	include/wimlib/rbtree.h		\
 	include/wimlib/reparse.h	\
@@ -148,11 +155,13 @@ endif
 install-exec-hook:
 	if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
 		cd $(DESTDIR)$(bindir) && mv -f imagex "@IMAGEX_PROGNAME@"; \
+		cd $(DESTDIR)$(bindir) && ln -s "@IMAGEX_PROGNAME@" imagex; \
 	fi
 
 uninstall-hook:
 	if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
 		cd $(DESTDIR)$(bindir) && rm -f "@IMAGEX_PROGNAME@"; \
+		cd $(DESTDIR)$(bindir) && rm -f imagex;	\
 	fi
 
 dist_bin_SCRIPTS = programs/mkwinpeimg
@@ -164,6 +173,7 @@ EXTRA_DIST =					\
 	archlinux				\
 	debian					\
 	rpm					\
+	examples				\
 	README.WINDOWS				\
 	programs/install.cmd			\
 	programs/wimapply.c			\