From 339c20aea74d5b4c6b8b178b478cc5530bc9af79 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 25 Apr 2024 12:01:40 -0400
Subject: config: Add BFS_USE_LIB* to config.h instead of CPPFLAGS

---
 config/config.mk | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'config/config.mk')

diff --git a/config/config.mk b/config/config.mk
index 5750b49..280c6ac 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -44,34 +44,19 @@ ${GEN}/vars.mk::
 # Sets the build flags.  This depends on vars.mk and uses a recursive make so
 # that the default flags can depend on variables like ${OS}.
 ${GEN}/flags.mk: ${GEN}/vars.mk
-	@+${MAKE} -sf config/flags.mk
+	@+${MAKE} -sf config/flags.mk $@
 .PHONY: ${GEN}/flags.mk
 
 # Check for dependency generation support
 ${GEN}/deps.mk: ${GEN}/flags.mk
-	@+${MAKE} -sf config/deps.mk
+	@+${MAKE} -sf config/deps.mk $@
 .PHONY: ${GEN}/deps.mk
 
-# External dependencies
-PKG_MKS := \
-    ${GEN}/libacl.mk \
-    ${GEN}/libcap.mk \
-    ${GEN}/libselinux.mk \
-    ${GEN}/liburing.mk \
-    ${GEN}/oniguruma.mk
-
 # Auto-detect dependencies and their build flags
-${GEN}/pkgs.mk: ${PKG_MKS}
-	@printf '# %s\n' "${TGT}" >$@
-	@printf 'include $${GEN}/%s\n' ${.ALLSRC:${GEN}/%=%} >>$@
-	@+${MAKE} -sf config/pkgs.mk
+${GEN}/pkgs.mk: ${GEN}/flags.mk
+	@+${MAKE} -sf config/pkgs.mk $@
 .PHONY: ${GEN}/pkgs.mk
 
-# Auto-detect dependencies
-${PKG_MKS}: ${GEN}/flags.mk
-	@+${MAKE} -sf config/pkg.mk TARGET=$@
-.PHONY: ${PKG_MKS}
-
 # Compile-time feature detection
 ${GEN}/config.h: ${CONFIG}
 	@+${MAKE} -sf config/header.mk $@
-- 
cgit v1.2.3