Rename --including-invalid-names to --include-invalid-names

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 75ed97168a1f8f8c3d4565235aca651541559b22..f18a5ce0529ebb354bbe70286d620e8588f07589 100644 (file)
--- 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         \
@@ -150,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