X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=d75d065b303c0f09e6d835bd63767235d3b3dee1;hb=a0ab870124b71d950072609cf97c3c0ef5eb4655;hp=8592d076ad48fa97bda94892c815b8c9c2325636;hpb=390297684c75522725cafdd8017ee615c0c64763;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index 8592d076..d75d065b 100644
--- 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 6: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,19 @@ 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
+else
+libwim_la_SOURCES += src/unix_capture.c
 endif
 
 install-exec-hook:
@@ -145,6 +154,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 +162,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)