From 65698f880486d2fc8ac3b1bcfec5527014fb76d7 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Wed, 8 Sep 2004 10:07:12 +0000 Subject: [PATCH] More hackery... build now fails on multiple definiations of `wday' and `mon' *sigh* I'm going to bed. --- src/sbbs3/GNUmakefile | 5 +++++ src/sbbs3/targets.mk | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile index a2b58d028b..23e0cf7fe7 100644 --- a/src/sbbs3/GNUmakefile +++ b/src/sbbs3/GNUmakefile @@ -255,6 +255,7 @@ CHKSMB_OBJS = \ $(LIBODIR)/smbdump.o \ $(LIBODIR)/conwrap.o \ $(LIBODIR)/dirwrap.o \ + $(LIBODIR)/filewrap.o \ $(LIBODIR)/genwrap.o FORCE$(CHKSMB): $(CHKSMB_OBJS) @@ -267,6 +268,7 @@ SMBUTIL_OBJS = \ $(LIBODIR)/smbutil.o \ $(LIBODIR)/conwrap.o \ $(LIBODIR)/dirwrap.o \ + $(LIBODIR)/filewrap.o \ $(LIBODIR)/genwrap.o \ $(LIBODIR)/date_str.o \ $(LIBODIR)/str_util.o @@ -409,3 +411,6 @@ $(ASC2ANS): $(LIBODIR)/asc2ans.o $(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $^ $(ADD_LIBS) FORCE: + +SMBLIB: $(SMBLIB_TARGET) + diff --git a/src/sbbs3/targets.mk b/src/sbbs3/targets.mk index 083ea8f3b3..33df64ef36 100644 --- a/src/sbbs3/targets.mk +++ b/src/sbbs3/targets.mk @@ -34,11 +34,11 @@ UTILS = $(BUILD_DEPENDS)$(FIXSMB) $(BUILD_DEPENDS)$(CHKSMB) \ $(BUILD_DEPENDS)$(ANS2ASC) $(BUILD_DEPENDS)$(ASC2ANS) \ $(BUILD_DEPENDS)$(JSEXEC) -all: $(LIBODIR) $(EXEODIR) $(SBBSMONO) $(UTILS) $(SBBSCON) +all: SMBLIB $(LIBODIR) $(EXEODIR) $(SBBSMONO) $(UTILS) $(SBBSCON) -utils: $(EXEODIR) $(UTILS) +utils: SMBLIB $(EXEODIR) $(UTILS) -dlls: $(LIBODIR) \ +dlls: SMBLIB $(LIBODIR) \ $(SBBS) $(FTPSRVR) $(MAILSRVR) $(SERVICES) -mono: $(LIBODIR) $(EXEODIR) $(SBBSMONO) +mono: SMBLIB $(LIBODIR) $(EXEODIR) $(SBBSMONO) -- GitLab