Merge compiler-gcc.h into compiler.h

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0169882cd1c75c1d395c609468cabb1a9259c32a..26bf66061a095c33ac952a0ab553f3690bdc2028 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,14 +70,16 @@ libwim_la_SOURCES =         \
        src/mount_image.c       \
        src/pathlist.c          \
        src/paths.c             \
+       src/pattern.c           \
        src/progress.c          \
-       src/resource.c          \
        src/reference.c         \
+       src/registry.c          \
+       src/reparse.c           \
+       src/resource.c          \
        src/security.c          \
        src/sha1.c              \
        src/solid.c             \
        src/split.c             \
-       src/reparse.c           \
        src/tagged_items.c      \
        src/template.c          \
        src/textfile.c          \
@@ -85,10 +87,11 @@ libwim_la_SOURCES =         \
        src/update_image.c      \
        src/util.c              \
        src/verify.c            \
-       src/wildcard.c          \
        src/wim.c               \
        src/write.c             \
+       src/x86_cpu_features.c  \
        src/xml.c               \
+       src/xml_windows.c       \
        src/xpress_compress.c   \
        src/xpress_decompress.c \
        include/wimlib/alloca.h         \
@@ -98,11 +101,9 @@ libwim_la_SOURCES =         \
        include/wimlib/bitops.h         \
        include/wimlib/blob_table.h     \
        include/wimlib/bt_matchfinder.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       \
@@ -129,13 +130,12 @@ libwim_la_SOURCES =               \
        include/wimlib/lzms_constants.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          \
+       include/wimlib/pattern.h        \
        include/wimlib/progress.h       \
+       include/wimlib/registry.h       \
        include/wimlib/reparse.h        \
        include/wimlib/resource.h       \
        include/wimlib/security.h       \
@@ -148,10 +148,11 @@ libwim_la_SOURCES =               \
        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/x86_cpu_features.h       \
        include/wimlib/xml.h            \
+       include/wimlib/xml_windows.h    \
        include/wimlib/xpress_constants.h
 
 if WITH_NTFS_3G
@@ -161,14 +162,16 @@ libwim_la_SOURCES += src/ntfs-3g_apply.c  \
 endif
 
 if WINDOWS_NATIVE_BUILD
-libwim_la_SOURCES += src/win32_common.c                        \
+libwim_la_SOURCES += src/wimboot.c                     \
+                    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             \
+                    src/win32_vss.c                    \
                     include/wimlib/wimboot.h           \
+                    include/wimlib/win32.h             \
+                    include/wimlib/win32_common.h      \
+                    include/wimlib/win32_vss.h         \
                     include/wimlib/wof.h
 else
 libwim_la_SOURCES += src/unix_apply.c          \
@@ -183,7 +186,7 @@ libwim_la_CFLAGS =          \
        $(LIBFUSE_CFLAGS)       \
        $(LIBCRYPTO_CFLAGS)
 
-libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 21:0:6
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 24:0:9
 
 libwim_la_LIBADD =             \
        $(PTHREAD_LIBS)         \