From 58bb1f0a23b105e5ad71fc3b1d8b5c1377ecf30f Mon Sep 17 00:00:00 2001
From: Daniel McCarney <daniel@binaryparadox.net>
Date: Fri, 4 Oct 2024 11:32:50 -0400
Subject: [PATCH] Makefile: adjust default target, broaden all target

Previously the default target ('all') built the rustls-ffi static
library and the client/server example binaries.

This commit adds a new default target ('default') that only builds the
static lib. It also updates 'all' to include integration and
connect-tests to truly be all the things.
---
 .github/workflows/test.yaml |  2 +-
 Makefile                    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0038a11d..2f6a3ad8 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -64,7 +64,7 @@ jobs:
       - name: Build release binaries
         run: |
           make clean
-          make CC=${{ matrix.cc }} CRYPTO_PROVIDER=${{ matrix.crypto }} PROFILE=release
+          make CC=${{ matrix.cc }} CRYPTO_PROVIDER=${{ matrix.crypto }} PROFILE=release test
       - name: Verify release builds were not using ASAN
         if: runner.os == 'Linux' # For 'nm'
         run: |
diff --git a/Makefile b/Makefile
index 4d8d6660..0eacf1d7 100644
--- a/Makefile
+++ b/Makefile
@@ -41,12 +41,14 @@ ifeq ($(COMPRESSION), true)
 	LDFLAGS += -lm
 endif
 
-all: target/client target/server
+default: target/$(PROFILE)/librustls_ffi.a
 
-test: all
+all: default test integration connect-test
+
+test: target/client target/server
 	${CARGO} test ${CARGOFLAGS}
 
-integration: all
+integration: test
 	${CARGO} test ${CARGOFLAGS} -- --ignored
 
 connect-test: target/client
@@ -97,4 +99,4 @@ format-check:
 	cargo fmt --check
 	sed -i -e 's/if true {/ffi_panic_boundary! {/g' src/*.rs
 
-.PHONY: all clean test integration format format-check
+.PHONY: default all clean test integration format format-check