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

diff --git a/Makefile.am b/Makefile.am
index 75ed9716..8f6dc96b 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 8:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -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	\
@@ -150,11 +156,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