[btls] Fix function declaration and add it to btls-key.h header

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

diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am
index 4f640bead0b48af843e84f9bad5ec66905541d60..1d96c943c95fc71960bd8188d8b59765878365f3 100644 (file)
--- a/mono/btls/Makefile.am
+++ b/mono/btls/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = btls-android-utils.c \
+EXTRA_DIST = \
        btls-bio.c \
        btls-bio.h \
        btls-error.c \
@@ -11,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 \
@@ -44,14 +45,14 @@ all-local: build-shared/libmono-btls-shared$(libsuffix) build-static/libmono-btl
 
 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)
+       (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
        $(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)
+       (cd build-static && CC="$(CC)" CXX="$(CXX)" $(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)
@@ -61,4 +62,5 @@ clean-local:
        -rm -rf build-shared
 
 install-exec-local:
-       $(install_sh) build-shared/libmono-btls-shared.* "$(DESTDIR)/$(libdir)"
+       $(mkinstalldirs) "$(DESTDIR)$(libdir)"
+       $(install_sh) build-shared/libmono-btls-shared.* "$(DESTDIR)$(libdir)"