]> wimlib.net Git - wimlib/blobdiff - Makefile.am
Save memory by using hlist for i_dentry
[wimlib] / Makefile.am
index 24810eec15c8951477c3136b150e25931c8a9eb2..206a0c22f2808bff13bc81dbd5f261076759587c 100644 (file)
@@ -1,25 +1,42 @@
+##############################################################################
+#                              General                                      #
+##############################################################################
+
+
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS    = -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \
+AM_CPPFLAGS    = -I$(top_srcdir)/include $(PLATFORM_CPPFLAGS)  \
                  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-AM_CFLAGS      = -std=c99 -Wmissing-prototypes -Wstrict-prototypes     \
-                 -Werror-implicit-function-declaration                 \
-                 -fno-common -Wundef -Wno-pointer-sign
+# Note: -std=gnu99 instead of -std=c99 is needed for unnamed structs and unions,
+# which are in C11 but not C99.  But we can't yet actually use -std=c11 because
+# we want to support older versions of gcc.
+AM_CFLAGS      = -std=gnu99 $(PLATFORM_CFLAGS) -fno-common     \
+                 -Wmissing-prototypes -Wstrict-prototypes      \
+                 -Wundef -Wno-pointer-sign
 
-if WINDOWS_NATIVE_BUILD
-# This option is needed to make packed structures work as expected
-# with gcc 4.7+ (mingw) on Windows.
-AM_CFLAGS += -mno-ms-bitfields
-endif
+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 18:0:3 $(WINDOWS_LDFLAGS)
+pkgconfigdir   = @pkgconfigdir@
+pkgconfig_DATA = wimlib.pc
+wimlib.pc: config.status
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
        src/avl_tree.c          \
+       src/blob_table.c        \
        src/capture_common.c    \
        src/compress.c          \
        src/compress_common.c   \
@@ -42,21 +59,13 @@ libwim_la_SOURCES =         \
        src/integrity.c         \
        src/iterate_dir.c       \
        src/join.c              \
-       src/lookup_table.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/lcpit_matchfinder.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/metadata_resource.c \
        src/mount_image.c       \
        src/pathlist.c          \
@@ -66,6 +75,7 @@ libwim_la_SOURCES =           \
        src/reference.c         \
        src/security.c          \
        src/sha1.c              \
+       src/solid.c             \
        src/split.c             \
        src/reparse.c           \
        src/tagged_items.c      \
@@ -79,13 +89,15 @@ libwim_la_SOURCES =         \
        src/wim.c               \
        src/write.c             \
        src/xml.c               \
-       src/xpress-compress.c   \
-       src/xpress-decompress.c \
+       src/xpress_compress.c   \
+       src/xpress_decompress.c \
+       include/wimlib/alloca.h         \
        include/wimlib/apply.h          \
        include/wimlib/assert.h         \
        include/wimlib/avl_tree.h       \
        include/wimlib/bitops.h         \
-       include/wimlib/callback.h       \
+       include/wimlib/blob_table.h     \
+       include/wimlib/bt_matchfinder.h \
        include/wimlib/capture.h        \
        include/wimlib/case.h           \
        include/wimlib/compiler.h       \
@@ -102,22 +114,23 @@ libwim_la_SOURCES =               \
        include/wimlib/error.h          \
        include/wimlib/file_io.h        \
        include/wimlib/glob.h           \
+       include/wimlib/guid.h           \
+       include/wimlib/hc_matchfinder.h \
        include/wimlib/header.h         \
        include/wimlib/inode.h          \
        include/wimlib/inode_table.h    \
        include/wimlib/integrity.h      \
+       include/wimlib/lcpit_matchfinder.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/lz_hash.h        \
+       include/wimlib/lzms_common.h    \
        include/wimlib/lzms_constants.h \
-       include/wimlib/lzx.h            \
+       include/wimlib/lzx_common.h     \
        include/wimlib/lzx_constants.h  \
+       include/wimlib/matchfinder_avx2.h       \
+       include/wimlib/matchfinder_common.h     \
+       include/wimlib/matchfinder_sse2.h       \
        include/wimlib/metadata.h       \
        include/wimlib/pathlist.h       \
        include/wimlib/paths.h          \
@@ -127,6 +140,7 @@ libwim_la_SOURCES =         \
        include/wimlib/security.h       \
        include/wimlib/security_descriptor.h    \
        include/wimlib/sha1.h           \
+       include/wimlib/solid.h          \
        include/wimlib/textfile.h       \
        include/wimlib/timestamp.h      \
        include/wimlib/types.h          \
@@ -137,7 +151,7 @@ libwim_la_SOURCES =         \
        include/wimlib/wim.h            \
        include/wimlib/write.h          \
        include/wimlib/xml.h            \
-       include/wimlib/xpress.h
+       include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
 libwim_la_SOURCES += src/ntfs-3g_apply.c       \
@@ -160,44 +174,50 @@ libwim_la_SOURCES += src/unix_apply.c             \
                     src/unix_capture.c
 endif
 
+libwim_la_CFLAGS =             \
+       $(AM_CFLAGS)            \
+       $(PTHREAD_CFLAGS)       \
+       $(LIBXML2_CFLAGS)       \
+       $(LIBNTFS_3G_CFLAGS)    \
+       $(LIBFUSE_CFLAGS)       \
+       $(LIBCRYPTO_CFLAGS)
+
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 21:0:6
 
+libwim_la_LIBADD =             \
+       $(PTHREAD_LIBS)         \
+       $(LIBXML2_LIBS)         \
+       $(LTLIBICONV)           \
+       $(LIBNTFS_3G_LIBS)      \
+       $(LIBFUSE_LIBS)         \
+       $(LIBRT_LIBS)           \
+       $(LIBCRYPTO_LIBS)
 
-EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
-libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
+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_WINDOWS_FLAGS)                            \
+       $(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 $@
 
-libwim_la_LIBADD =             \
-       $(LIBXML2_LIBS)         \
-       $(LIBFUSE_LIBS)         \
-       $(LIBRT_LIBS)           \
-       $(LIBNTFS_3G_LIBS)      \
-       $(LTLIBICONV)           \
-       $(LIBCRYPTO_LIBS)       \
-       $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)
-
-libwim_la_CFLAGS =             \
-       $(AM_CFLAGS)            \
-       $(VISIBILITY_CFLAGS)    \
-       $(LIBXML2_CFLAGS)       \
-       $(LIBFUSE_CFLAGS)       \
-       $(LIBNTFS_3G_CFLAGS)    \
-       $(LIBCRYPTO_CFLAGS)
+EXTRA_DIST += build-aux/nasm_lt.sh
+endif
 
+##############################################################################
+#                              Programs                                     #
+##############################################################################
 
 bin_PROGRAMS = wimlib-imagex
+dist_bin_SCRIPTS = programs/mkwinpeimg
+
 wimlib_imagex_SOURCES =                \
        programs/imagex.c       \
        include/wimlib.h        \
        include/wimlib_tchar.h
-wimlib_imagex_LDADD = $(top_builddir)/libwim.la
-wimlib_imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations
 
 if WINDOWS_NATIVE_BUILD
 wimlib_imagex_SOURCES +=       \
@@ -207,6 +227,10 @@ wimlib_imagex_SOURCES +=   \
        programs/wgetopt.h
 endif
 
+wimlib_imagex_CFLAGS = $(AM_CFLAGS) -Wno-deprecated-declarations
+
+wimlib_imagex_LDADD = $(top_builddir)/libwim.la
+
 wimlib_imagex_cmds =   \
        append          \
        apply           \
@@ -225,6 +249,10 @@ wimlib_imagex_cmds =       \
        update          \
        verify
 
+##############################################################################
+#                                Hooks                                      #
+##############################################################################
+
 install-exec-hook:
        for cmd in $(wimlib_imagex_cmds); do                            \
                cd $(DESTDIR)$(bindir) &&                               \
@@ -240,37 +268,14 @@ install-data-hook:
 uninstall-hook:
        for cmd in $(wimlib_imagex_cmds); do                            \
                rm -f $(DESTDIR)$(bindir)/wim$${cmd};                   \
-               rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1;            \
+               rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1;            \
        done
 
-dist_bin_SCRIPTS = programs/mkwinpeimg
-
-include_HEADERS = include/wimlib.h
-
-EXTRA_DIST =                                   \
-       build-aux/nasm_lt.sh                    \
-       archlinux                               \
-       debian                                  \
-       rpm                                     \
-       examples                                \
-       COPYING                                 \
-       COPYING.GPLv3                           \
-       COPYING.LGPLv3                          \
-       README                                  \
-       README.WINDOWS                          \
-       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
-
-pkgconfigdir   = @pkgconfigdir@
-pkgconfig_DATA = wimlib.pc
-
-$(pkgconfig_DATA): config.status
+##############################################################################
+#                              Documentation                                #
+##############################################################################
 
-wimlib_manpages =                              \
+man1_MANS =                                    \
        doc/man1/wimlib-imagex.1                \
        doc/man1/wimlib-imagex-append.1         \
        doc/man1/wimlib-imagex-apply.1          \
@@ -290,10 +295,11 @@ wimlib_manpages =                         \
        doc/man1/wimlib-imagex-verify.1         \
        doc/man1/mkwinpeimg.1
 
-man1_MANS = $(wimlib_manpages)
-DISTCLEANFILES = $(wimlib_manpages)
+EXTRA_DIST += $(man1_MANS)
 
-$(man1_MANS): config.status
+##############################################################################
+#                                Tests                                      #
+##############################################################################
 
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
@@ -310,6 +316,14 @@ 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 =
@@ -317,3 +331,4 @@ else
 TESTS = $(dist_check_SCRIPTS)
 endif
 
+##############################################################################