X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fbtls%2FMakefile.am;h=33bfb1f6f73e8934d5e0f8f294c3b74e001cc3b8;hb=8da992455796f5fad14728f6a82d21c770025cea;hp=38f879c629fcf8dd79a18a199798bf8b3ef9ea7c;hpb=94b8270e9bdbd9280de1ec144af20877d8c8d055;p=mono.git

diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am
index 38f879c629f..33bfb1f6f73 100644
--- 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,23 @@ EXTRA_DIST = \
 	btls-x509-verify-param.h \
 	CMakeLists.txt
 
+EXTRA_DIST = $(MONO_BTLS_SOURCES_FILES)
+
 CMAKE_VERBOSE=$(if $(V),VERBOSE=1,)
 
 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)"
 
-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:
 	-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
+build-shared/libmono-btls-shared$(libsuffix): build-shared/Makefile $(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)
-
 clean-local:
-	-rm -rf build-static
 	-rm -rf build-shared
 
 install-exec-local: