Fix UNIX build; rename functions; comments

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b03208356142f5e3770a96918bcc2f8d90c9a75e..7700f46ac78bdb703939dbe6f84488882fbf5282 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,17 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS    = -I$(top_srcdir)/src
+AM_CPPFLAGS    = -I$(top_srcdir)/src $(WINDOWS_CPPFLAGS)
 
 AM_CFLAGS      = -std=gnu99 -D_LARGEFILE_SOURCE \
                   -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 1:0:0
+libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
+       src/buffer_io.h         \
        src/compress.c          \
        src/compress.h          \
        src/decompress.c        \
@@ -18,13 +19,13 @@ libwim_la_SOURCES =         \
        src/delete_image.c      \
        src/dentry.c            \
        src/dentry.h            \
+       src/encoding.c          \
        src/endianness.h        \
        src/export_image.c      \
        src/extract_image.c     \
        src/hardlink.c          \
        src/header.c            \
        src/integrity.c         \
-       src/io.h                \
        src/join.c              \
        src/list.h              \
        src/lookup_table.c      \
@@ -34,11 +35,11 @@ libwim_la_SOURCES =         \
        src/lzx-compress.c      \
        src/lzx-decompress.c    \
        src/lzx.h               \
+       src/metadata_resource.c \
        src/mount_image.c       \
        src/resource.c          \
        src/rbtree.c            \
        src/rbtree.h            \
-       src/rbtree_augmented.h  \
        src/security.c          \
        src/security.h          \
        src/sha1.c              \
@@ -48,6 +49,7 @@ libwim_la_SOURCES =           \
        src/timestamp.h         \
        src/util.c              \
        src/util.h              \
+       src/verify.c            \
        src/wim.c               \
        src/wimlib.h            \
        src/wimlib_internal.h   \
@@ -80,11 +82,12 @@ libwim_la_LIBADD =          \
        $(LTLIBICONV)           \
        $(LIBCRYPTO_LDADD)      \
        $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)
+       $(PTHREAD_LDADD)        \
+       $(WINDOWS_LDADD)
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
-       -fvisibility=hidden     \
+       $(VISIBILITY_CFLAGS)    \
        $(LIBXML2_CFLAGS)       \
        $(LIBFUSE_CFLAGS)       \
        $(LIBNTFS_3G_CFLAGS)    \
@@ -95,6 +98,11 @@ bin_PROGRAMS  = imagex
 imagex_SOURCES   = programs/imagex.c
 imagex_LDADD    = $(top_builddir)/libwim.la
 
+if WINDOWS_NATIVE_BUILD
+imagex_SOURCES += programs/imagex-win32.c programs/imagex-win32.h
+libwim_la_SOURCES += src/win32.c
+endif
+
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
@@ -104,6 +112,7 @@ EXTRA_DIST =                                        \
        archlinux                               \
        debian                                  \
        rpm                                     \
+       README.WINDOWS                          \
        programs/install.cmd                    \
        programs/wimapply.c                     \
        tests/common_tests.sh                   \
@@ -151,5 +160,10 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+if WINDOWS_NATIVE_BUILD
+# TODO: The tests need to be re-written for Windows builds.
+TESTS =
+else
 TESTS = $(dist_check_SCRIPTS)
+endif