Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / btls / Makefile.am

diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am
index 38f879c629fcf8dd79a18a199798bf8b3ef9ea7c..0902fb41fb84df8430700f6c918665f6e7f4e45a 100644 (file)
--- a/mono/btls/Makefile.am
+++ b/mono/btls/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = \
+MONO_BTLS_SOURCES_FILES = \
        btls-bio.c \
        btls-bio.h \
        btls-error.c \
@@ -36,29 +36,37 @@ EXTRA_DIST = \
        btls-x509-verify-param.h \
        CMakeLists.txt
 
+EXTRA_DIST = $(MONO_BTLS_SOURCES_FILES)
+
 CMAKE_VERBOSE=$(if $(V),VERBOSE=1,)
+NINJA_VERBOSE=$(if ($V),-v,)
+
+if NINJA
+NINJA_ARGS = -G Ninja
+BUILDFILE = build.ninja
+else
+NINJA_ARGS =
+BUILDFILE = Makefile
+endif
 
 CMAKE_ARGS = -D CMAKE_INSTALL_PREFIX:PATH=$(prefix) -D BTLS_ROOT:PATH=$(BTLS_ROOT) \
-       -D SRC_DIR:PATH=$(abs_top_srcdir)/mono/btls -D BTLS_CFLAGS:STRING="$(BTLS_CFLAGS)"
+       -D SRC_DIR:PATH=$(abs_top_srcdir)/mono/btls -D BTLS_CFLAGS:STRING="$(BTLS_CFLAGS)" $(NINJA_ARGS)
 
-all-local: build-shared/libmono-btls-shared$(libsuffix) build-static/libmono-btls-static.a
+all-local: build-shared/libmono-btls-shared$(libsuffix)
 
-build-shared/Makefile:
+build-shared/$(BUILDFILE):
        -mkdir -p build-shared
-       (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls)
+       (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls)
 
-build-shared/libmono-btls-shared$(libsuffix): build-shared/Makefile
+if NINJA
+build-shared/libmono-btls-shared$(libsuffix): build-shared/$(BUILDFILE) $(MONO_BTLS_SOURCES_FILES)
+       ninja -C build-shared $(NINJA_VERBOSE)
+else
+build-shared/libmono-btls-shared$(libsuffix): build-shared/$(BUILDFILE) $(MONO_BTLS_SOURCES_FILES)
        $(MAKE) -C build-shared $(CMAKE_VERBOSE)
-
-build-static/Makefile:
-       -mkdir -p build-static
-       (cd build-static && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls)
-
-build-static/libmono-btls-static.a: build-static/Makefile
-       $(MAKE) -C build-static $(CMAKE_VERBOSE)
+endif
 
 clean-local:
-       -rm -rf build-static
        -rm -rf build-shared
 
 install-exec-local: