From 692a749816645b8707f197dc3cb4d6464d084717 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 24 Aug 2023 05:09:38 -0900 Subject: [PATCH] Makefile: move -ldb from hardcoded to a new BACKEND_LDFLAGS --- citadel/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/citadel/Makefile b/citadel/Makefile index a4c7f5536..5c483e3fc 100644 --- a/citadel/Makefile +++ b/citadel/Makefile @@ -18,11 +18,13 @@ 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 -ldb \ + -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \ -o citserver $(SERVER_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h @@ -54,10 +56,10 @@ chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h cc ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd ctdldump: utils/ctdldump.c utils/*.h server/*.h - cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz -ldb -lpthread -o ctdldump + cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdldump ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h - cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz -ldb -lpthread -o ctdlload + cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload config.mk: configure ./configure -- 2.39.2