X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=0d07ea112437b2bd693bf091f5b208eaa76ba40b;hp=96a9d3901b47faa20ed62a455f84065bf0c30e57;hb=c44ed3d9615e8fb8e660903f61a16fe21599f4e9;hpb=85c0b4fc1f9600630e063316e85e8a92abef4cf3

diff --git a/Makefile.am b/Makefile.am
index 96a9d390..0d07ea11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,148 +1,310 @@
+##############################################################################
+#				General					     #
+##############################################################################
+
+
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS	= -I$(top_srcdir)/src
+AM_CPPFLAGS	= -I$(top_srcdir)/include $(PLATFORM_CPPFLAGS)	\
+		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
+AM_CFLAGS	= -std=c99 $(PLATFORM_CFLAGS) -fno-common	\
+		  -Wmissing-prototypes -Wstrict-prototypes	\
+		  -Wundef -Wno-pointer-sign
 
-AM_CFLAGS	= -std=gnu99 -D_LARGEFILE_SOURCE \
-		   -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
+
+EXTRA_DIST	= README README.WINDOWS				\
+		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
+		  examples					\
+		  archlinux debian rpm
+
+##############################################################################
+#				Library					     #
+##############################################################################
 
 lib_LTLIBRARIES = libwim.la
+include_HEADERS = include/wimlib.h
 
-libwim_la_LDFLAGS = -version-info 2:0:0
+pkgconfigdir	= @pkgconfigdir@
+pkgconfig_DATA	= wimlib.pc
+wimlib.pc: config.status
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
-	src/buffer_io.h		\
+	src/avl_tree.c		\
+	src/capture_common.c	\
 	src/compress.c		\
-	src/compress.h		\
+	src/compress_common.c	\
+	src/compress_parallel.c	\
+	src/compress_serial.c	\
 	src/decompress.c	\
-	src/decompress.h	\
+	src/decompress_common.c	\
 	src/delete_image.c	\
 	src/dentry.c		\
-	src/dentry.h		\
-	src/endianness.h	\
+	src/divsufsort.c	\
+	src/encoding.c		\
+	src/error.c		\
 	src/export_image.c	\
-	src/extract_image.c	\
-	src/hardlink.c		\
+	src/extract.c		\
+	src/file_io.c		\
 	src/header.c		\
+	src/inode.c		\
+	src/inode_fixup.c	\
+	src/inode_table.c	\
 	src/integrity.c		\
+	src/iterate_dir.c	\
 	src/join.c		\
-	src/list.h		\
 	src/lookup_table.c	\
-	src/lookup_table.h	\
-	src/lz77.c		\
+	src/lz_binary_trees.c	\
+	src/lz_hash_chains.c	\
+	src/lz_lcp_interval_tree.c	\
+	src/lz_linked_suffix_array.c	\
+	src/lz_mf.c		\
+	src/lz_null.c		\
+	src/lz_repsearch.c	\
+	src/lz_suffix_array_utils.c	\
+	src/lzms-common.c	\
+	src/lzms-compress.c	\
+	src/lzms-decompress.c	\
 	src/lzx-common.c	\
 	src/lzx-compress.c	\
 	src/lzx-decompress.c	\
-	src/lzx.h		\
 	src/metadata_resource.c	\
 	src/mount_image.c	\
+	src/pathlist.c		\
+	src/paths.c		\
+	src/progress.c		\
 	src/resource.c		\
-	src/rbtree.c		\
-	src/rbtree.h		\
+	src/reference.c		\
 	src/security.c		\
-	src/security.h		\
 	src/sha1.c		\
-	src/sha1.h		\
 	src/split.c		\
-	src/symlink.c		\
-	src/timestamp.h		\
+	src/reparse.c		\
+	src/tagged_items.c	\
+	src/template.c		\
+	src/textfile.c		\
+	src/timestamp.c		\
+	src/update_image.c	\
 	src/util.c		\
-	src/util.h		\
 	src/verify.c		\
+	src/wildcard.c		\
 	src/wim.c		\
-	src/wimlib.h		\
-	src/wimlib_internal.h	\
 	src/write.c		\
 	src/xml.c		\
-	src/xml.h		\
 	src/xpress-compress.c	\
-	src/xpress-decompress.c	\
-	src/xpress.h
+	src/xpress-decompress.c \
+	include/wimlib/apply.h		\
+	include/wimlib/assert.h		\
+	include/wimlib/avl_tree.h	\
+	include/wimlib/bitops.h		\
+	include/wimlib/callback.h	\
+	include/wimlib/capture.h	\
+	include/wimlib/case.h		\
+	include/wimlib/compiler.h	\
+	include/wimlib/compiler-gcc.h	\
+	include/wimlib/compressor_ops.h	\
+	include/wimlib/compress_common.h	\
+	include/wimlib/chunk_compressor.h	\
+	include/wimlib/decompressor_ops.h	\
+	include/wimlib/decompress_common.h	\
+	include/wimlib/dentry.h		\
+	include/wimlib/divsufsort.h	\
+	include/wimlib/encoding.h	\
+	include/wimlib/endianness.h	\
+	include/wimlib/error.h		\
+	include/wimlib/file_io.h	\
+	include/wimlib/glob.h		\
+	include/wimlib/header.h		\
+	include/wimlib/inode.h		\
+	include/wimlib/inode_table.h	\
+	include/wimlib/integrity.h	\
+	include/wimlib/list.h		\
+	include/wimlib/lookup_table.h	\
+	include/wimlib/lz_extend.h	\
+	include/wimlib/lz_hash3.h	\
+	include/wimlib/lz_mf.h		\
+	include/wimlib/lz_mf_ops.h	\
+	include/wimlib/lz_repsearch.h	\
+	include/wimlib/lz_suffix_array_utils.h	\
+	include/wimlib/lzms.h		\
+	include/wimlib/lzms_constants.h	\
+	include/wimlib/lzx.h		\
+	include/wimlib/lzx_constants.h	\
+	include/wimlib/metadata.h	\
+	include/wimlib/pathlist.h	\
+	include/wimlib/paths.h		\
+	include/wimlib/progress.h	\
+	include/wimlib/reparse.h	\
+	include/wimlib/resource.h	\
+	include/wimlib/security.h	\
+	include/wimlib/security_descriptor.h	\
+	include/wimlib/sha1.h		\
+	include/wimlib/textfile.h	\
+	include/wimlib/timestamp.h	\
+	include/wimlib/types.h		\
+	include/wimlib/unaligned.h	\
+	include/wimlib/unix_data.h	\
+	include/wimlib/util.h		\
+	include/wimlib/wildcard.h	\
+	include/wimlib/wim.h		\
+	include/wimlib/write.h		\
+	include/wimlib/xml.h		\
+	include/wimlib/xpress.h
 
 if WITH_NTFS_3G
-libwim_la_SOURCES += src/ntfs-apply.c	\
-		     src/ntfs-capture.c
+libwim_la_SOURCES += src/ntfs-3g_apply.c	\
+		     src/ntfs-3g_capture.c	\
+		     include/wimlib/ntfs_3g.h
 endif
 
-
-EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
-libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
-STRIP_FPIC = sh $(top_srcdir)/build-aux/strip_fPIC.sh
-
-sha1-ssse3.lo:src/sha1-ssse3.asm
-	$(LIBTOOL) --mode=compile --tag=CC $(STRIP_FPIC) $(NASM) -f elf64 \
-	-DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=ssse3_not_found \
-	$<
-
-libwim_la_LIBADD =		\
-	$(LIBXML2_LDADD)	\
-	$(LIBFUSE_LDADD)	\
-	$(LIBNTFS_3G_LDADD)	\
-	$(LTLIBICONV)		\
-	$(LIBCRYPTO_LDADD)	\
-	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)
+if WINDOWS_NATIVE_BUILD
+libwim_la_SOURCES += src/win32_common.c			\
+		     src/win32_apply.c			\
+		     src/win32_capture.c		\
+		     src/win32_replacements.c		\
+		     src/wimboot.c			\
+		     include/wimlib/win32_common.h	\
+		     include/wimlib/win32.h		\
+		     include/wimlib/wimboot.h		\
+		     include/wimlib/wof.h
+else
+libwim_la_SOURCES += src/unix_apply.c		\
+		     src/unix_capture.c
+endif
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
-	-fvisibility=hidden	\
 	$(LIBXML2_CFLAGS)	\
-	$(LIBFUSE_CFLAGS)	\
 	$(LIBNTFS_3G_CFLAGS)	\
+	$(LIBFUSE_CFLAGS)	\
 	$(LIBCRYPTO_CFLAGS)
 
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 18:0:3
+
+libwim_la_LIBADD =		\
+	-lpthread		\
+	$(LIBXML2_LIBS)		\
+	$(LTLIBICONV)		\
+	$(LIBNTFS_3G_LIBS)	\
+	$(LIBFUSE_LIBS)		\
+	$(LIBRT_LIBS)		\
+	$(LIBCRYPTO_LIBS)
+
+if ENABLE_SSSE3_SHA1
+libwim_la_SOURCES += src/sha1-ssse3.asm
+libwim_la_LIBADD += src/sha1-ssse3.lo
+
+src/sha1-ssse3.lo:src/sha1-ssse3.asm
+	$(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+	$(NASM) $(NAFLAGS) $(NASM_PLATFORM_FLAGS)			    \
+	-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
 
-bin_PROGRAMS	 = imagex
-imagex_SOURCES   = programs/imagex.c
-imagex_LDADD	 = $(top_builddir)/libwim.la
+##############################################################################
+#				Programs				     #
+##############################################################################
 
+bin_PROGRAMS = wimlib-imagex
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
-include_HEADERS = src/wimlib.h
+wimlib_imagex_SOURCES =		\
+	programs/imagex.c	\
+	include/wimlib.h	\
+	include/wimlib_tchar.h
 
-EXTRA_DIST =					\
-	build-aux/strip_fPIC.sh			\
-	archlinux				\
-	debian					\
-	rpm					\
-	programs/install.cmd			\
-	programs/wimapply.c			\
-	tests/common_tests.sh			\
-	tests/tests-common.sh			\
-	tests/security_descriptor_1.base64	\
-	tests/security_descriptor_1.bin		\
-	tests/security_descriptor_2.base64	\
-	tests/security_descriptor_2.bin
+if WINDOWS_NATIVE_BUILD
+wimlib_imagex_SOURCES +=	\
+	programs/imagex-win32.c	\
+	programs/imagex-win32.h	\
+	programs/wgetopt.c	\
+	programs/wgetopt.h
+endif
 
-pkgconfigdir	= @pkgconfigdir@
-pkgconfig_DATA	= wimlib.pc
+wimlib_imagex_CFLAGS = $(AM_CFLAGS) -Wno-deprecated-declarations
+
+wimlib_imagex_LDADD = $(top_builddir)/libwim.la
+
+wimlib_imagex_cmds =	\
+	append		\
+	apply		\
+	capture		\
+	delete		\
+	dir		\
+	export		\
+	extract		\
+	info		\
+	join		\
+	mount		\
+	mountrw		\
+	optimize	\
+	split		\
+	unmount		\
+	update		\
+	verify
+
+##############################################################################
+#				  Hooks					     #
+##############################################################################
+
+install-exec-hook:
+	for cmd in $(wimlib_imagex_cmds); do				\
+		cd $(DESTDIR)$(bindir) &&				\
+			ln -f wimlib-imagex wim$${cmd};			\
+	done
+
+install-data-hook:
+	for cmd in $(wimlib_imagex_cmds); do				\
+		cd $(DESTDIR)$(mandir)/man1 &&				\
+			ln -sf wimlib-imagex-$${cmd}.1 wim$${cmd}.1;	\
+	done
 
-$(pkgconfig_DATA): config.status
-
-man1_MANS =			\
-	doc/imagex.1		\
-	doc/imagex-append.1	\
-	doc/imagex-apply.1	\
-	doc/imagex-capture.1	\
-	doc/imagex-delete.1	\
-	doc/imagex-dir.1	\
-	doc/imagex-export.1	\
-	doc/imagex-info.1	\
-	doc/imagex-join.1	\
-	doc/imagex-mount.1	\
-	doc/imagex-mountrw.1	\
-	doc/imagex-optimize.1	\
-	doc/imagex-split.1	\
-	doc/imagex-unmount.1	\
-	doc/mkwinpeimg.1
-
-$(man1_MANS): config.status
+uninstall-hook:
+	for cmd in $(wimlib_imagex_cmds); do				\
+		rm -f $(DESTDIR)$(bindir)/wim$${cmd};			\
+		rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1;		\
+	done
+
+##############################################################################
+#				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		\
+	doc/man1/mkwinpeimg.1
+
+EXTRA_DIST += $(man1_MANS)
+
+##############################################################################
+#				  Tests					     #
+##############################################################################
 
 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
@@ -152,5 +314,19 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+EXTRA_DIST +=					\
+	tests/common_tests.sh			\
+	tests/tests-common.sh			\
+	tests/security_descriptor_1.base64	\
+	tests/security_descriptor_1.bin		\
+	tests/security_descriptor_2.base64	\
+	tests/security_descriptor_2.bin
+
+if WINDOWS_NATIVE_BUILD
+# Tests are run manually for Windows builds.
+TESTS =
+else
 TESTS = $(dist_check_SCRIPTS)
+endif
 
+##############################################################################