Replace rename()

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca3c1d3bf0e1552e4adb54fdee6a594130b66935..7700f46ac78bdb703939dbe6f84488882fbf5282 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 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 4:0:2 $(CYGWIN_EXTRA_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 4:0:2 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -53,7 +53,6 @@ libwim_la_SOURCES =           \
        src/wim.c               \
        src/wimlib.h            \
        src/wimlib_internal.h   \
-       src/win32.c             \
        src/write.c             \
        src/xml.c               \
        src/xml.h               \
@@ -83,7 +82,8 @@ libwim_la_LIBADD =            \
        $(LTLIBICONV)           \
        $(LIBCRYPTO_LDADD)      \
        $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)
+       $(PTHREAD_LDADD)        \
+       $(WINDOWS_LDADD)
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
@@ -98,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
@@ -155,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