From dc88744316e9eb0620f5d9c4ccab7d7e4f959f8f Mon Sep 17 00:00:00 2001
From: Robert Pincus <Robert.Pincus@columbia.edu>
Date: Wed, 28 Feb 2024 10:21:33 -0500
Subject: [PATCH] Make front-end/kernel libraries by default

---
 .github/workflows/containerized-ci.yml       | 1 -
 .github/workflows/continuous-integration.yml | 1 -
 .github/workflows/self-hosted-ci.yml         | 1 -
 .gitlab/levante.yml                          | 1 -
 .gitlab/lumi.yml                             | 1 -
 build/Makefile                               | 3 ++-
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml
index a43718cf1..0f247ba05 100644
--- a/.github/workflows/containerized-ci.yml
+++ b/.github/workflows/containerized-ci.yml
@@ -81,7 +81,6 @@ jobs:
       run: |
         $FC --version
         make -j4 libs
-        make -j4 -C build separate-libs
     #
     # Build libraries, examples and tests (expect failure)
     #
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ed8ccd964..3cb19a757 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -90,7 +90,6 @@ jobs:
       run: |
         $FC --version
         make -j4 libs
-        make -j4 -C build separate-libs
     #
     # Run examples and tests
     #
diff --git a/.github/workflows/self-hosted-ci.yml b/.github/workflows/self-hosted-ci.yml
index 3e4810eff..21fe2116e 100644
--- a/.github/workflows/self-hosted-ci.yml
+++ b/.github/workflows/self-hosted-ci.yml
@@ -97,7 +97,6 @@ jobs:
       run: |
         $FC --version
         make -j8 libs
-        make -j8 -C build separate-libs
     #
     # Run examples and tests (expect success)
     #
diff --git a/.gitlab/levante.yml b/.gitlab/levante.yml
index 78de62697..4835a4383 100644
--- a/.gitlab/levante.yml
+++ b/.gitlab/levante.yml
@@ -78,7 +78,6 @@ variables:
     #
     - ${FC} ${VERSION_FCFLAGS}
     - make -j8 libs
-    - make -j8 -C build separate-libs
     #
     # Check out data
     #
diff --git a/.gitlab/lumi.yml b/.gitlab/lumi.yml
index 997ccf4b9..245129d5c 100644
--- a/.gitlab/lumi.yml
+++ b/.gitlab/lumi.yml
@@ -93,7 +93,6 @@ setup-python:
     #
     - ${FC} ${VERSION_FCFLAGS}
     - make -j8 libs
-    - make -j8 -C build separate-libs
     #
     # Check out data
     #
diff --git a/build/Makefile b/build/Makefile
index d00adcb3a..800bbed3e 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -9,7 +9,8 @@ RRTMGP_KERNEL_DIR = ../rrtmgp-kernels
 # Compiler variables FC, FCFLAGS must be set in the environment
 #
 # Make all the libraries though we'll only use the interface + kernels
-all:           librte.a                  librrtmgp.a
+all:           librte.a                  librrtmgp.a \
+               librtekernels.a librtef.a librrtmgpkernels.a librrtmgpf.a
 separate-libs: librtekernels.a librtef.a librrtmgpkernels.a librrtmgpf.a
 
 COMPILE = $(FC) $(FCFLAGS) $(FCINCLUDE) -c