imagex-update.1.in: Minor fixes

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8592d076ad48fa97bda94892c815b8c9c2325636..0aede5918141e3e181bfcfa733c6f80c9565cbb2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,17 @@
 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 7:0:0 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
        src/buffer_io.h         \
+       src/capture_common.c    \
        src/compress.c          \
        src/compress.h          \
        src/decompress.c        \
@@ -45,13 +45,15 @@ libwim_la_SOURCES =         \
        src/sha1.c              \
        src/sha1.h              \
        src/split.c             \
-       src/symlink.c           \
+       src/reparse.c           \
        src/timestamp.h         \
+       src/update_image.c      \
        src/util.c              \
        src/util.h              \
        src/verify.c            \
        src/wim.c               \
        src/wimlib.h            \
+       wimlib_tchar.h          \
        src/wimlib_internal.h   \
        src/write.c             \
        src/xml.c               \
@@ -95,12 +97,24 @@ 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
-libwim_la_SOURCES += src/win32.c
+imagex_SOURCES += programs/imagex-win32.c      \
+                 programs/imagex-win32.h       \
+                 programs/wgetopt.c            \
+                 programs/wgetopt.h
+
+libwim_la_SOURCES += src/win32_common.c                \
+                    src/win32_apply.c          \
+                    src/win32_capture.c        \
+                    src/win32.h                \
+                    src/win32_common.h
+else
+libwim_la_SOURCES += src/unix_apply.c          \
+                    src/unix_capture.c
 endif
 
 install-exec-hook:
@@ -145,6 +159,7 @@ wimlib_manpages =                           \
        doc/@IMAGEX_PROGNAME@-delete.1          \
        doc/@IMAGEX_PROGNAME@-dir.1             \
        doc/@IMAGEX_PROGNAME@-export.1          \
+       doc/@IMAGEX_PROGNAME@-extract.1         \
        doc/@IMAGEX_PROGNAME@-info.1            \
        doc/@IMAGEX_PROGNAME@-join.1            \
        doc/@IMAGEX_PROGNAME@-mount.1           \
@@ -152,6 +167,7 @@ wimlib_manpages =                           \
        doc/@IMAGEX_PROGNAME@-optimize.1        \
        doc/@IMAGEX_PROGNAME@-split.1           \
        doc/@IMAGEX_PROGNAME@-unmount.1         \
+       doc/@IMAGEX_PROGNAME@-update.1          \
        doc/mkwinpeimg.1
 
 man1_MANS = $(wimlib_manpages)
@@ -163,7 +179,8 @@ check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
 dist_check_SCRIPTS = tests/test-imagex \
-                    tests/test-imagex-capture_and_apply
+                    tests/test-imagex-capture_and_apply \
+                    tests/test-imagex-update_and_extract
 
 if WITH_FUSE
 dist_check_SCRIPTS += tests/test-imagex-mount
@@ -174,7 +191,7 @@ dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
 if WINDOWS_NATIVE_BUILD
-# TODO: The tests need to be re-written for Windows builds.
+# Tests are run manually for Windows builds.
 TESTS =
 else
 TESTS = $(dist_check_SCRIPTS)