Win32 apply: Accept ERROR_ACCESS_DENIED for SACL access denied

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ed45a7bca76a1eb132fb16ac0a291e967c3a290a..24c07649cf99cc28246a923227d5fdb5ed95653a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,12 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS    = -I$(top_srcdir)/src $(WINDOWS_CPPFLAGS)
-
-AM_CFLAGS      = -std=gnu99 -D_LARGEFILE_SOURCE \
-                  -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+AM_CPPFLAGS    = -I$(top_srcdir)/src $(WINDOWS_CPPFLAGS) \
+                 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+AM_CFLAGS      = -std=gnu99 -fno-strict-aliasing
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 6:0:0 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -52,6 +51,7 @@ libwim_la_SOURCES =           \
        src/verify.c            \
        src/wim.c               \
        src/wimlib.h            \
+       wimlib_tchar.h          \
        src/wimlib_internal.h   \
        src/write.c             \
        src/xml.c               \
@@ -95,11 +95,16 @@ libwim_la_CFLAGS =          \
 
 
 bin_PROGRAMS    = imagex
-imagex_SOURCES   = programs/imagex.c
+imagex_SOURCES   = programs/imagex.c wimlib_tchar.h
 imagex_LDADD    = $(top_builddir)/libwim.la
+imagex_CFLAGS    = $(AM_CFLAGS) $(WINDOWS_CFLAGS)
 
 if WINDOWS_NATIVE_BUILD
-imagex_SOURCES += programs/imagex-win32.c programs/imagex-win32.h
+imagex_SOURCES += programs/imagex-win32.c      \
+                 programs/imagex-win32.h       \
+                 programs/wgetopt.c            \
+                 programs/wgetopt.h
+
 libwim_la_SOURCES += src/win32.c
 endif
 
@@ -137,7 +142,7 @@ pkgconfig_DATA      = wimlib.pc
 
 $(pkgconfig_DATA): config.status
 
-man1_MANS =                                    \
+wimlib_manpages =                              \
        doc/@IMAGEX_PROGNAME@.1                 \
        doc/@IMAGEX_PROGNAME@-append.1          \
        doc/@IMAGEX_PROGNAME@-apply.1           \
@@ -154,6 +159,9 @@ man1_MANS =                                 \
        doc/@IMAGEX_PROGNAME@-unmount.1         \
        doc/mkwinpeimg.1
 
+man1_MANS = $(wimlib_manpages)
+DISTCLEANFILES = $(wimlib_manpages)
+
 $(man1_MANS): config.status
 
 check_PROGRAMS = tests/tree-cmp