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

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6feab393f3be127b5f33e75336e7148f278fae51..f18a5ce0529ebb354bbe70286d620e8588f07589 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +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 -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         \
@@ -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       \
@@ -147,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