X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=b3bb69170bec67e288ec797d61080788427615d0;hp=ed45a7bca76a1eb132fb16ac0a291e967c3a290a;hb=1f2091f5bb860769e20105af2d9eff3a0872c57b;hpb=232c381f9f3ab814258aa8e2380f537498a50905

diff --git a/Makefile.am b/Makefile.am
index ed45a7bc..b3bb6917 100644
--- 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
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 5: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