X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=66acc43f775b7c30dde7fa0ef577a0a22e7a62dd;hb=a02e29cb96edb138c7b220c472e09c2abe3eb858;hp=a74a4445cf9ce5db52eedb68cc652fa86c478934;hpb=e6aef6a0af9e26797ca1711a8014a5fb62b3755e;p=wimlib

diff --git a/Makefile.am b/Makefile.am
index a74a4445..66acc43f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,9 @@ AM_CFLAGS	= -std=gnu99 $(PLATFORM_CFLAGS) -fno-common	\
 
 AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
 
-EXTRA_DIST	= README README.WINDOWS				\
-		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
-		  examples					\
+EXTRA_DIST	= README README.WINDOWS					\
+		  COPYING COPYING.GPLv3	COPYING.LGPLv3 COPYING.CC0	\
+		  examples						\
 		  archlinux debian rpm
 
 ##############################################################################
@@ -143,6 +143,7 @@ libwim_la_SOURCES =		\
 	include/wimlib/security_descriptor.h	\
 	include/wimlib/sha1.h		\
 	include/wimlib/solid.h		\
+	include/wimlib/tagged_items.h	\
 	include/wimlib/textfile.h	\
 	include/wimlib/timestamp.h	\
 	include/wimlib/types.h		\
@@ -152,6 +153,7 @@ libwim_la_SOURCES =		\
 	include/wimlib/wim.h		\
 	include/wimlib/write.h		\
 	include/wimlib/x86_cpu_features.h	\
+	include/wimlib/xattr.h		\
 	include/wimlib/xml.h		\
 	include/wimlib/xml_windows.h	\
 	include/wimlib/xpress_constants.h
@@ -181,6 +183,16 @@ libwim_la_SOURCES += src/unix_apply.c		\
 PLATFORM_LIBS =
 endif
 
+if ENABLE_TEST_SUPPORT
+libwim_la_SOURCES += src/test_support.c		\
+		     include/wimlib/test_support.h
+if WINDOWS_NATIVE_BUILD
+# Workaround for "multiple definition" error when math symbols are present in
+# both libmsvcrt.a and ntdll.a
+AM_LDFLAGS += -Wl,--allow-multiple-definition
+endif
+endif
+
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
 	$(PTHREAD_CFLAGS)	\
@@ -189,12 +201,11 @@ libwim_la_CFLAGS =		\
 	$(LIBFUSE_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 25:0:10
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 27:0:12
 
 libwim_la_LIBADD =		\
 	$(PTHREAD_LIBS)		\
 	$(LIBXML2_LIBS)		\
-	$(LTLIBICONV)		\
 	$(LIBNTFS_3G_LIBS)	\
 	$(LIBFUSE_LIBS)		\
 	$(LIBRT_LIBS)		\
@@ -211,9 +222,8 @@ src/sha1-ssse3.lo:src/sha1-ssse3.asm
 	-DINTEL_SHA1_UPDATE_FUNCNAME=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_ssse3	    \
 	-DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_default  \
 	$< -o $@
-
-EXTRA_DIST += build-aux/nasm_lt.sh
 endif
+EXTRA_DIST += build-aux/nasm_lt.sh
 
 ##############################################################################
 #				Programs				     #
@@ -270,7 +280,7 @@ install-exec-hook:
 install-data-hook:
 	for cmd in $(wimlib_imagex_cmds); do				\
 		cd $(DESTDIR)$(mandir)/man1 &&				\
-			ln -sf wimlib-imagex-$${cmd}.1 wim$${cmd}.1;	\
+			ln -sf wim$${cmd}.1 wimlib-imagex-$${cmd}.1;	\
 	done
 
 uninstall-hook:
@@ -283,24 +293,24 @@ uninstall-hook:
 #				Documentation				     #
 ##############################################################################
 
-man1_MANS =					\
-	doc/man1/wimlib-imagex.1		\
-	doc/man1/wimlib-imagex-append.1		\
-	doc/man1/wimlib-imagex-apply.1		\
-	doc/man1/wimlib-imagex-capture.1	\
-	doc/man1/wimlib-imagex-delete.1		\
-	doc/man1/wimlib-imagex-dir.1		\
-	doc/man1/wimlib-imagex-export.1		\
-	doc/man1/wimlib-imagex-extract.1	\
-	doc/man1/wimlib-imagex-info.1		\
-	doc/man1/wimlib-imagex-join.1		\
-	doc/man1/wimlib-imagex-mount.1		\
-	doc/man1/wimlib-imagex-mountrw.1	\
-	doc/man1/wimlib-imagex-optimize.1	\
-	doc/man1/wimlib-imagex-split.1		\
-	doc/man1/wimlib-imagex-unmount.1	\
-	doc/man1/wimlib-imagex-update.1		\
-	doc/man1/wimlib-imagex-verify.1		\
+man1_MANS =				\
+	doc/man1/wimlib-imagex.1	\
+	doc/man1/wimappend.1		\
+	doc/man1/wimapply.1		\
+	doc/man1/wimcapture.1		\
+	doc/man1/wimdelete.1		\
+	doc/man1/wimdir.1		\
+	doc/man1/wimexport.1		\
+	doc/man1/wimextract.1		\
+	doc/man1/wiminfo.1		\
+	doc/man1/wimjoin.1		\
+	doc/man1/wimmount.1		\
+	doc/man1/wimmountrw.1		\
+	doc/man1/wimoptimize.1		\
+	doc/man1/wimsplit.1		\
+	doc/man1/wimunmount.1		\
+	doc/man1/wimupdate.1		\
+	doc/man1/wimverify.1		\
 	doc/man1/mkwinpeimg.1
 
 EXTRA_DIST += $(man1_MANS)
@@ -339,4 +349,9 @@ else
 TESTS = $(dist_check_SCRIPTS)
 endif
 
+# Extra test programs (not run by 'make check')
+EXTRA_PROGRAMS = tests/wlfuzz
+tests_wlfuzz_SOURCES = tests/wlfuzz.c
+tests_wlfuzz_LDADD = $(top_builddir)/libwim.la
+
 ##############################################################################