Fix ninja BTLS build for verbose builds (#5673)

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

diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am
index 714bfb1a863e03a6a7dc0fc4dbc7305ebc6b2859..0902fb41fb84df8430700f6c918665f6e7f4e45a 100644 (file)
--- a/mono/btls/Makefile.am
+++ b/mono/btls/Makefile.am
@@ -1,7 +1,4 @@
-BTLS_STATIC_LIST = build-static/mono-btls-static-lo.txt
-BTLS_SHARED_LIST = build-shared/mono-btls-shared-lo.txt
-
-EXTRA_DIST = btls-android-utils.c \
+MONO_BTLS_SOURCES_FILES = \
        btls-bio.c \
        btls-bio.h \
        btls-error.c \
@@ -14,6 +11,7 @@ EXTRA_DIST = btls-android-utils.c \
        btls-ssl-ctx.c \
        btls-ssl-ctx.h \
        btls-ssl.h \
+       btls-time64.c \
        btls-util.c \
        btls-util.h \
        btls-x509.c \
@@ -36,41 +34,41 @@ EXTRA_DIST = btls-android-utils.c \
        btls-x509-store.h \
        btls-x509-verify-param.c \
        btls-x509-verify-param.h \
-       CMakeLists.txt \
-       create-object-library.sh
-
-CMAKE_VERBOSE=$(if $(V),VERBOSE=1,)
+       CMakeLists.txt
 
-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)"
+EXTRA_DIST = $(MONO_BTLS_SOURCES_FILES)
 
-all-local: $(BTLS_STATIC_LIST) $(BTLS_SHARED_LIST)
+CMAKE_VERBOSE=$(if $(V),VERBOSE=1,)
+NINJA_VERBOSE=$(if ($V),-v,)
 
-if DYNAMIC_BTLS
-build-shared/Makefile:
-       -mkdir -p build-shared
-       (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls)
+if NINJA
+NINJA_ARGS = -G Ninja
+BUILDFILE = build.ninja
 else
-build-shared/Makefile:
-       -mkdir -p build-shared
-       (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls)
+NINJA_ARGS =
+BUILDFILE = Makefile
 endif
 
-build-static/Makefile:
-       -mkdir -p build-static
-       (cd build-static && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls)
+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)" $(NINJA_ARGS)
+
+all-local: build-shared/libmono-btls-shared$(libsuffix)
 
-$(BTLS_STATIC_LIST): build-static/Makefile
-       $(MAKE) -C build-static $(CMAKE_VERBOSE)
+build-shared/$(BUILDFILE):
+       -mkdir -p build-shared
+       (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls)
 
-$(BTLS_SHARED_LIST): 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)
+endif
 
 clean-local:
-       -rm -rf build-static
        -rm -rf build-shared
 
-if DYNAMIC_BTLS
 install-exec-local:
-       $(install_sh) build-shared/libmono-btls-shared.* "$(DESTDIR)/$(libdir)"
-endif
+       $(mkinstalldirs) "$(DESTDIR)$(libdir)"
+       $(install_sh) build-shared/libmono-btls-shared.* "$(DESTDIR)$(libdir)"