diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile index 8ce66a78a51892baebf19fdd6743c3c07f65b08b..96b6645df2ffe4c9d96eee5989470c6eebaf6569 100644 --- a/src/sbbs3/GNUmakefile +++ b/src/sbbs3/GNUmakefile @@ -198,47 +198,47 @@ $(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UNBAJA_OBJS) $(XPDEV_LIBS) $(UTIL_LIBS) # Node Utility -$(NODE): $(NODE_OBJS) $(ENCODE_LIB) +$(NODE): $(NODE_OBJS) $(ENCODE_LIB) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(NODE_OBJS) $(XPDEV_LIBS) $(ENCODE_LIBS) # FIXSMB Utility -$(FIXSMB): $(FIXSMB_OBJS) +$(FIXSMB): $(FIXSMB_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # CHKSMB Utility -$(CHKSMB): $(CHKSMB_OBJS) +$(CHKSMB): $(CHKSMB_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SMB Utility -$(SMBUTIL): $(SMBUTIL_OBJS) +$(SMBUTIL): $(SMBUTIL_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SBBSecho (FidoNet Packet Tosser) -$(SBBSECHO): $(SBBSECHO_OBJS) +$(SBBSECHO): $(SBBSECHO_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) # SBBSecho Configuration Program -$(ECHOCFG): $(ECHOCFG_OBJS) $(ENCODE_LIB) +$(ECHOCFG): $(ECHOCFG_OBJS) $(ENCODE_LIB) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(UTIL_LDFLAGS) $(MT_LDFLAGS) -o $@ $(ECHOCFG_OBJS) $(UIFC-MT_LDFLAGS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) $(ENCODE_LIBS) # ADDFILES -$(ADDFILES): $(ADDFILES_OBJS) +$(ADDFILES): $(ADDFILES_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) # FILELIST -$(FILELIST): $(FILELIST_OBJS) $(ENCODE_LIB) +$(FILELIST): $(FILELIST_OBJS) $(ENCODE_LIB) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FILELIST_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) # MAKEUSER -$(MAKEUSER): $(MAKEUSER_OBJS) +$(MAKEUSER): $(MAKEUSER_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) @@ -248,17 +248,17 @@ $(JSDOOR): $(JSDOOR_OBJS) $(XPDEV_LIB) $(ENCODE_LIB) $(HASH_LIB) | $(EXEODIR) $(QUIET)$(CXX) $(JS_CFLAGS) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(JSDOOR_OBJS) $(JS_LIBS) $(CRYPT_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(XPDEV-MT_LIBS) $(HASH_LIBS) $(FILE_LIBS) # JSEXEC -$(JSEXEC): $(JSEXEC_OBJS) $(SBBS) +$(JSEXEC): $(JSEXEC_OBJS) $(SBBS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CXX) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(JSEXEC_OBJS) -lsbbs $(JS_LIBS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) # ANS2ASC -$(ANS2ASC): $(OBJODIR)/ans2asc.o $(OBJODIR)/sauce.o $(XPDEV_LIB) +$(ANS2ASC): $(OBJODIR)/ans2asc.o $(OBJODIR)/sauce.o $(XPDEV_LIB) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $^ -lm # ASC2ANS -$(ASC2ANS): $(OBJODIR)/asc2ans.o +$(ASC2ANS): $(OBJODIR)/asc2ans.o | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(OBJODIR)/asc2ans.o @@ -268,50 +268,45 @@ $(SEXYZ): $(SEXYZ_OBJS) | $(EXEODIR) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) $(MT_LDFLAGS) -o $@ $(SEXYZ_OBJS) $(HASH_LIBS) $(XPDEV-MT_LIBS) # QWKNODES -$(QWKNODES): $(QWKNODES_OBJS) +$(QWKNODES): $(QWKNODES_OBJS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SLOG -$(SLOG): $(SLOG_OBJS) $(SBBS) +$(SLOG): $(SLOG_OBJS) $(SBBS) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SLOG_OBJS) $(XPDEV_LIBS) -lsbbs # DELFILES -$(DELFILES): $(DELFILES_OBJS) $(ENCODE_LIB) +$(DELFILES): $(DELFILES_OBJS) $(ENCODE_LIB) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DELFILES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) # DUPEFIND -$(DUPEFIND): $(DUPEFIND_OBJS) $(ENCODE_LIB) +$(DUPEFIND): $(DUPEFIND_OBJS) $(ENCODE_LIB) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DUPEFIND_OBJS) $(SMBLIB_LIBS) $(HASH_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) -# DSTSEDIT -$(DSTSEDIT): $(DSTSEDIT_OBJS) $(ENCODE_LIB) - @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DSTSEDIT_OBJS) $(XPDEV_LIBS) $(ENCODE_LIBS) - # READSAUCE -$(READSAUCE): $(READSAUCE_OBJS) $(OBJODIR) $(EXEODIR) +$(READSAUCE): $(READSAUCE_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(READSAUCE_OBJS) $(XPDEV_LIBS) # PKTDUMP -$(PKTDUMP): $(PKTDUMP_OBJS) $(OBJODIR) $(EXEODIR) +$(PKTDUMP): $(PKTDUMP_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(PKTDUMP_OBJS) # FMSGDUMP -$(FMSGDUMP): $(FMSGDUMP_OBJS) $(OBJODIR) $(EXEODIR) +$(FMSGDUMP): $(FMSGDUMP_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FMSGDUMP_OBJS) -$(UPGRADE_TO_V319): $(UPGRADE_TO_V319_OBJS) $(OBJODIR) $(EXEODIR) +$(UPGRADE_TO_V319): $(UPGRADE_TO_V319_OBJS) $(OBJODIR) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UPGRADE_TO_V319_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) -$(UPGRADE_TO_V320): $(UPGRADE_TO_V320_OBJS) $(OBJODIR) $(EXEODIR) +$(UPGRADE_TO_V320): $(UPGRADE_TO_V320_OBJS) $(OBJODIR) | $(EXEODIR) @echo Linking $@ $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UPGRADE_TO_V320_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) diff --git a/src/sbbs3/targets.mk b/src/sbbs3/targets.mk index 8afbcd2163f32a9c0ca9d42a44437886fc759826..07471770bf8ec6ccc553889f24a8df18574e3999 100644 --- a/src/sbbs3/targets.mk +++ b/src/sbbs3/targets.mk @@ -43,7 +43,7 @@ UTILS = $(FIXSMB) $(CHKSMB) \ $(ANS2ASC) $(ASC2ANS) $(UNBAJA) \ $(QWKNODES) $(SLOG) \ $(DELFILES) $(DUPEFIND) \ - $(SEXYZ) $(DSTSEDIT) $(READSAUCE) \ + $(SEXYZ) $(READSAUCE) \ $(PKTDUMP) $(FMSGDUMP) $(UPGRADE_TO_V319) \ $(UPGRADE_TO_V320) @@ -162,7 +162,6 @@ $(QWKNODES): $(XPDEV_LIB) $(SLOG): $(XPDEV_LIB) $(DELFILES): $(XPDEV_LIB) $(SMBLIB) $(DUPEFIND): $(XPDEV_LIB) $(SMBLIB) -$(DSTSEDIT): $(XPDEV_LIB) $(READSAUCE): $(XPDEV_LIB) $(UPGRADE_TO_V319): $(XPDEV_LIB) $(SMBLIB) $(UPGRADE_TO_V320): $(XPDEV_LIB)