From 5f557b4cb6e0fe2db1d41fb538fafbf6f46721fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Tue, 6 Feb 2024 22:38:55 -0500
Subject: [PATCH] Make directories order-only so they don't cause re-linking
---
src/sbbs3/GNUmakefile | 4 ++--
src/sbbs3/scfg/GNUmakefile | 2 +-
src/sbbs3/scfg/targets.mk | 2 --
src/sbbs3/uedit/GNUmakefile | 2 +-
src/sbbs3/uedit/targets.mk | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile
index c324e6f6b8..c3d9477a9a 100644
--- a/src/sbbs3/GNUmakefile
+++ b/src/sbbs3/GNUmakefile
@@ -196,7 +196,7 @@ $(SBBSCON): $(CON_OBJS) $(SBBS) $(FTPSRVR) $(WEBSRVR) $(MAILSRVR) $(SERVICES)
$(QUIET)$(CXX) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(CON_OBJS) $(CON_LIBS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS)
# Baja Utility
-$(BAJA): $(BAJA_OBJS)
+$(BAJA): $(BAJA_OBJS) | $(EXEODIR)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(BAJA_OBJS) $(XPDEV_LIBS) $(HASH_LIBS)
@@ -307,7 +307,7 @@ $(READSAUCE): $(READSAUCE_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(READSAUCE_OBJS) $(XPDEV_LIBS)
# PKTDUMP
-$(PKTDUMP): $(PKTDUMP_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR)
+$(PKTDUMP): $(PKTDUMP_OBJS) | $(OBJODIR) $(EXEODIR)
@echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(PKTDUMP_OBJS)
diff --git a/src/sbbs3/scfg/GNUmakefile b/src/sbbs3/scfg/GNUmakefile
index 3a4537061d..191a3e4ec5 100644
--- a/src/sbbs3/scfg/GNUmakefile
+++ b/src/sbbs3/scfg/GNUmakefile
@@ -6,6 +6,6 @@ LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(UIFC-MT_LDFLAGS
vpath %.c ..
-$(SCFG): $(OBJS) $(CRYPT_DEPS)
+$(SCFG): $(OBJS) $(CRYPT_DEPS) | $(EXEODIR) $(MTOBJODIR)
@echo Linking $@
${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) -o$@ $(OBJS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(CRYPT_LIBS) $(XPDEV-MT_LIBS)
diff --git a/src/sbbs3/scfg/targets.mk b/src/sbbs3/scfg/targets.mk
index 0d04ca8a0e..abacb28cb8 100644
--- a/src/sbbs3/scfg/targets.mk
+++ b/src/sbbs3/scfg/targets.mk
@@ -10,8 +10,6 @@ all: xpdev-mt \
smblib \
encode \
hash \
- $(EXEODIR) \
- $(MTOBJODIR) \
$(SCFG)
ifdef SBBSEXEC
diff --git a/src/sbbs3/uedit/GNUmakefile b/src/sbbs3/uedit/GNUmakefile
index 7ae54cf5aa..2eacd9bd33 100644
--- a/src/sbbs3/uedit/GNUmakefile
+++ b/src/sbbs3/uedit/GNUmakefile
@@ -25,6 +25,6 @@ vpath %.c ..
CFLAGS += -DHAS_CURSES -I.. -I../../comio $(SMBLIB_CFLAGS) $(HASH_CFLAGS) $(ENCODE_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS)
LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS)
-$(UEDIT): $(OBJS)
+$(UEDIT): $(OBJS) | $(MTOBJODIR) $(EXEODIR)
@echo Linking $@
${QUIET}$(CC) $(LDFLAGS) $(OBJS) -o $@ $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
diff --git a/src/sbbs3/uedit/targets.mk b/src/sbbs3/uedit/targets.mk
index 0ffa408fbe..a5d8590fc4 100644
--- a/src/sbbs3/uedit/targets.mk
+++ b/src/sbbs3/uedit/targets.mk
@@ -1,6 +1,6 @@
UEDIT = $(EXEODIR)$(DIRSEP)uedit$(EXEFILE)
-all: smblib uifc-mt ciolib-mt xpdev-mt $(MTOBJODIR) $(EXEODIR) $(UEDIT)
+all: smblib uifc-mt ciolib-mt xpdev-mt $(UEDIT)
ifdef SBBSEXEC
.PHONY: install
--
GitLab