]> wimlib.net Git - wimlib/blobdiff - Makefile.am
wimlib_iterate_dir_tree(): iterate in default case order
[wimlib] / Makefile.am
index 0d07ea112437b2bd693bf091f5b208eaa76ba40b..79a91c4c7f257d709c27c484706bf16babfd38f8 100644 (file)
@@ -8,7 +8,10 @@ ACLOCAL_AMFLAGS = -I m4
 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       \
+# 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
 
@@ -56,20 +59,17 @@ libwim_la_SOURCES =         \
        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/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          \
@@ -92,12 +92,14 @@ 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/bt_matchfinder.h \
        include/wimlib/callback.h       \
        include/wimlib/capture.h        \
        include/wimlib/case.h           \
@@ -115,6 +117,7 @@ libwim_la_SOURCES =         \
        include/wimlib/error.h          \
        include/wimlib/file_io.h        \
        include/wimlib/glob.h           \
+       include/wimlib/hc_matchfinder.h \
        include/wimlib/header.h         \
        include/wimlib/inode.h          \
        include/wimlib/inode_table.h    \
@@ -122,15 +125,18 @@ libwim_la_SOURCES =               \
        include/wimlib/list.h           \
        include/wimlib/lookup_table.h   \
        include/wimlib/lz_extend.h      \
-       include/wimlib/lz_hash3.h       \
+       include/wimlib/lz_hash.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_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          \
@@ -150,7 +156,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       \
@@ -175,15 +181,16 @@ endif
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
+       $(PTHREAD_CFLAGS)       \
        $(LIBXML2_CFLAGS)       \
        $(LIBNTFS_3G_CFLAGS)    \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 18:0:3
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 19:0:4
 
 libwim_la_LIBADD =             \
-       -lpthread               \
+       $(PTHREAD_LIBS)         \
        $(LIBXML2_LIBS)         \
        $(LTLIBICONV)           \
        $(LIBNTFS_3G_LIBS)      \