From ee0cf6c2ba3f17cd2f6fdd09927d040cf1b827c8 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Tue, 23 Jul 2024 22:34:22 -0500
Subject: [PATCH] Move inter-lib dependencies to a project variable and into
 the build targets.

---
 build.jam        | 47 +++++++++++++++++++++++++----------------------
 build/Jamfile.v2 |  1 +
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/build.jam b/build.jam
index 9bfc04dcc8..a508be80d9 100644
--- a/build.jam
+++ b/build.jam
@@ -5,40 +5,42 @@
 
 require-b2 5.2 ;
 
+constant boost_dependencies :
+    /boost/algorithm//boost_algorithm
+    /boost/assert//boost_assert
+    /boost/bind//boost_bind
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/detail//boost_detail
+    /boost/exception//boost_exception
+    /boost/function//boost_function
+    /boost/io//boost_io
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/numeric_conversion//boost_numeric_conversion
+    /boost/optional//boost_optional
+    /boost/preprocessor//boost_preprocessor
+    /boost/smart_ptr//boost_smart_ptr
+    /boost/static_assert//boost_static_assert
+    /boost/type_traits//boost_type_traits
+    /boost/utility//boost_utility ;
+
 project /boost/test
     : common-requirements
-        <library>/boost/algorithm//boost_algorithm
-        <library>/boost/assert//boost_assert
-        <library>/boost/bind//boost_bind
-        <library>/boost/config//boost_config
-        <library>/boost/core//boost_core
-        <library>/boost/detail//boost_detail
-        <library>/boost/exception//boost_exception
-        <library>/boost/function//boost_function
-        <library>/boost/io//boost_io
-        <library>/boost/iterator//boost_iterator
-        <library>/boost/mpl//boost_mpl
-        <library>/boost/numeric_conversion//boost_numeric_conversion
-        <library>/boost/optional//boost_optional
-        <library>/boost/preprocessor//boost_preprocessor
-        <library>/boost/smart_ptr//boost_smart_ptr
-        <library>/boost/static_assert//boost_static_assert
-        <library>/boost/type_traits//boost_type_traits
-        <library>/boost/utility//boost_utility
         <include>include
     ;
 
 explicit
-    [ alias boost_test ]
+    [ alias boost_test : : : : <library>$(boost_dependencies) ]
     [ alias boost_prg_exec_monitor : build//boost_prg_exec_monitor ]
     [ alias boost_test_exec_monitor : build//boost_test_exec_monitor ]
     [ alias boost_unit_test_framework : build//boost_unit_test_framework ]
     [ alias prg_exec_monitor : boost_prg_exec_monitor ]
     [ alias test_exec_monitor : boost_test_exec_monitor ]
     [ alias unit_test_framework : boost_unit_test_framework ]
-    [ alias boost_included_prg_exec_monitor ]
-    [ alias boost_included_test_exec_monitor ]
-    [ alias boost_included_unit_test_framework ]
+    [ alias boost_included_prg_exec_monitor : : : : <library>$(boost_dependencies) ]
+    [ alias boost_included_test_exec_monitor : : : : <library>$(boost_dependencies) ]
+    [ alias boost_included_unit_test_framework : : : : <library>$(boost_dependencies) ]
     [ alias included_prg_exec_monitor : boost_included_prg_exec_monitor ]
     [ alias included_test_exec_monitor : boost_included_test_exec_monitor ]
     [ alias included_unit_test_framework : boost_included_unit_test_framework ]
@@ -54,3 +56,4 @@ call-if : boost-library test
         boost_test_exec_monitor
         boost_unit_test_framework
     ;
+
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 7419d19c57..d26622d6aa 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -12,6 +12,7 @@ import predef
 
 project
     : source-location ../src
+    : common-requirements <library>$(boost_dependencies)
     : requirements <link>shared:<define>BOOST_TEST_DYN_LINK=1
                    <toolset>borland:<cxxflags>-w-8080
                    <target-os>cygwin:<define>_POSIX_C_SOURCE=200112L