From e9dd879996a79c3e85b8e096e2701d5b021d508d Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 24 Aug 2023 06:08:02 -0900
Subject: [PATCH] Makefile: BACKEND_LDFLAGS "created" by configure

---
 citadel/Makefile  | 16 +++++++---------
 citadel/configure |  4 ++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/citadel/Makefile b/citadel/Makefile
index 5c483e3fc..5f62ba680 100644
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -18,15 +18,6 @@ SERVER_OBJECTS := $(patsubst %.c,%.o,$(SERVER_SOURCES))
 BACKEND_SOURCES := $(wildcard server/backends/*/*.c)
 BACKEND_OBJECTS := $(patsubst %.c,%.o,$(BACKEND_SOURCES))
 
-BACKEND_LDFLAGS = -ldb
-
-citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS)
-	cc ${CFLAGS} \
-		$(SERVER_OBJECTS) $(BACKEND_OBJECTS) \
-		${LDFLAGS} \
-		-lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \
-		-o citserver
-
 $(SERVER_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h
 	@touch $@
 
@@ -37,6 +28,13 @@ $(BACKEND_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h
 	@echo $<
 	@cc ${CFLAGS} -c $< -o $@
 
+citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS)
+	cc ${CFLAGS} \
+		$(SERVER_OBJECTS) $(BACKEND_OBJECTS) \
+		${LDFLAGS} \
+		-lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \
+		-o citserver
+
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h
 	cc ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup
 
diff --git a/citadel/configure b/citadel/configure
index 823a0c5bf..08b56c4fe 100755
--- a/citadel/configure
+++ b/citadel/configure
@@ -113,6 +113,9 @@ $CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile && {
 	}
 }
 
+# This is needed to link Berkeley DB.  We will add more here later.
+BACKEND_LDFLAGS=-ldb
+
 
 ########################################################################
 # The build ID can be generated from git or from the date
@@ -129,6 +132,7 @@ CFLAGS=${CFLAGS}' -DCTDLDIR=\"'${CTDLDIR}'\"'
 	echo "CTDLDIR := ${CTDLDIR}"
 	echo "CFLAGS := ${CFLAGS} ${CPPFLAGS}"
 	echo "LDFLAGS := ${LDFLAGS}"
+	echo "BACKEND_LDFLAGS := ${BACKEND_LDFLAGS}"
 ) >config.mk
 
 cat config.mk
-- 
2.39.2