Skip to content
Snippets Groups Projects
Commit 520dd313 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Add the EXEODIR as a dependency of all executable targets 

... weird this wasn't required before now.

Removed obsolete DSTSEDIT target.
parent 51395e45
No related branches found
No related tags found
No related merge requests found
Pipeline #5079 passed
Stage: build
Show whitespace changes
Inline Side-by-side
src/sbbs3/GNUmakefile
+ 21
− 26
View file @ 520dd313
...@@ -198,47 +198,47 @@ $(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR) ...@@ -198,47 +198,47 @@ $(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UNBAJA_OBJS) $(XPDEV_LIBS) $(UTIL_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UNBAJA_OBJS) $(XPDEV_LIBS) $(UTIL_LIBS)
# Node Utility # Node Utility
$(NODE): $(NODE_OBJS) $(ENCODE_LIB) $(NODE): $(NODE_OBJS) $(ENCODE_LIB) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(NODE_OBJS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(NODE_OBJS) $(XPDEV_LIBS) $(ENCODE_LIBS)
# FIXSMB Utility # FIXSMB Utility
$(FIXSMB): $(FIXSMB_OBJS) $(FIXSMB): $(FIXSMB_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
# CHKSMB Utility # CHKSMB Utility
$(CHKSMB): $(CHKSMB_OBJS) $(CHKSMB): $(CHKSMB_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
# SMB Utility # SMB Utility
$(SMBUTIL): $(SMBUTIL_OBJS) $(SMBUTIL): $(SMBUTIL_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
# SBBSecho (FidoNet Packet Tosser) # SBBSecho (FidoNet Packet Tosser)
$(SBBSECHO): $(SBBSECHO_OBJS) $(SBBSECHO): $(SBBSECHO_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS)
# SBBSecho Configuration Program # SBBSecho Configuration Program
$(ECHOCFG): $(ECHOCFG_OBJS) $(ENCODE_LIB) $(ECHOCFG): $(ECHOCFG_OBJS) $(ENCODE_LIB) | $(EXEODIR)
@echo Linking $@ @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) $(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): $(ADDFILES_OBJS) $(ADDFILES): $(ADDFILES_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS)
# FILELIST # FILELIST
$(FILELIST): $(FILELIST_OBJS) $(ENCODE_LIB) $(FILELIST): $(FILELIST_OBJS) $(ENCODE_LIB) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FILELIST_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FILELIST_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS)
# MAKEUSER # MAKEUSER
$(MAKEUSER): $(MAKEUSER_OBJS) $(MAKEUSER): $(MAKEUSER_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(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) ...@@ -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) $(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): $(JSEXEC_OBJS) $(SBBS) $(JSEXEC): $(JSEXEC_OBJS) $(SBBS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CXX) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(JSEXEC_OBJS) -lsbbs $(JS_LIBS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) $(QUIET)$(CXX) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(JSEXEC_OBJS) -lsbbs $(JS_LIBS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
# ANS2ASC # ANS2ASC
$(ANS2ASC): $(OBJODIR)/ans2asc.o $(OBJODIR)/sauce.o $(XPDEV_LIB) $(ANS2ASC): $(OBJODIR)/ans2asc.o $(OBJODIR)/sauce.o $(XPDEV_LIB) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $^ -lm $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $^ -lm
# ASC2ANS # ASC2ANS
$(ASC2ANS): $(OBJODIR)/asc2ans.o $(ASC2ANS): $(OBJODIR)/asc2ans.o | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(OBJODIR)/asc2ans.o $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(OBJODIR)/asc2ans.o
...@@ -268,50 +268,45 @@ $(SEXYZ): $(SEXYZ_OBJS) | $(EXEODIR) ...@@ -268,50 +268,45 @@ $(SEXYZ): $(SEXYZ_OBJS) | $(EXEODIR)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) $(MT_LDFLAGS) -o $@ $(SEXYZ_OBJS) $(HASH_LIBS) $(XPDEV-MT_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) $(MT_LDFLAGS) -o $@ $(SEXYZ_OBJS) $(HASH_LIBS) $(XPDEV-MT_LIBS)
# QWKNODES # QWKNODES
$(QWKNODES): $(QWKNODES_OBJS) $(QWKNODES): $(QWKNODES_OBJS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
# SLOG # SLOG
$(SLOG): $(SLOG_OBJS) $(SBBS) $(SLOG): $(SLOG_OBJS) $(SBBS) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SLOG_OBJS) $(XPDEV_LIBS) -lsbbs $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SLOG_OBJS) $(XPDEV_LIBS) -lsbbs
# DELFILES # DELFILES
$(DELFILES): $(DELFILES_OBJS) $(ENCODE_LIB) $(DELFILES): $(DELFILES_OBJS) $(ENCODE_LIB) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DELFILES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DELFILES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS)
# DUPEFIND # DUPEFIND
$(DUPEFIND): $(DUPEFIND_OBJS) $(ENCODE_LIB) $(DUPEFIND): $(DUPEFIND_OBJS) $(ENCODE_LIB) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DUPEFIND_OBJS) $(SMBLIB_LIBS) $(HASH_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(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): $(READSAUCE_OBJS) $(OBJODIR) $(EXEODIR) $(READSAUCE): $(READSAUCE_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(READSAUCE_OBJS) $(XPDEV_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(READSAUCE_OBJS) $(XPDEV_LIBS)
# PKTDUMP # PKTDUMP
$(PKTDUMP): $(PKTDUMP_OBJS) $(OBJODIR) $(EXEODIR) $(PKTDUMP): $(PKTDUMP_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(PKTDUMP_OBJS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(PKTDUMP_OBJS)
# FMSGDUMP # FMSGDUMP
$(FMSGDUMP): $(FMSGDUMP_OBJS) $(OBJODIR) $(EXEODIR) $(FMSGDUMP): $(FMSGDUMP_OBJS) $(OBJODIR) $(EXEODIR) | $(EXEODIR)
@echo Linking $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FMSGDUMP_OBJS) $(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 $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UPGRADE_TO_V319_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(FILE_LIBS) $(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 $@ @echo Linking $@
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UPGRADE_TO_V320_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(UPGRADE_TO_V320_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
src/sbbs3/targets.mk
+ 1
− 2
View file @ 520dd313
...@@ -43,7 +43,7 @@ UTILS = $(FIXSMB) $(CHKSMB) \ ...@@ -43,7 +43,7 @@ UTILS = $(FIXSMB) $(CHKSMB) \
$(ANS2ASC) $(ASC2ANS) $(UNBAJA) \ $(ANS2ASC) $(ASC2ANS) $(UNBAJA) \
$(QWKNODES) $(SLOG) \ $(QWKNODES) $(SLOG) \
$(DELFILES) $(DUPEFIND) \ $(DELFILES) $(DUPEFIND) \
$(SEXYZ) $(DSTSEDIT) $(READSAUCE) \ $(SEXYZ) $(READSAUCE) \
$(PKTDUMP) $(FMSGDUMP) $(UPGRADE_TO_V319) \ $(PKTDUMP) $(FMSGDUMP) $(UPGRADE_TO_V319) \
$(UPGRADE_TO_V320) $(UPGRADE_TO_V320)
...@@ -162,7 +162,6 @@ $(QWKNODES): $(XPDEV_LIB) ...@@ -162,7 +162,6 @@ $(QWKNODES): $(XPDEV_LIB)
$(SLOG): $(XPDEV_LIB) $(SLOG): $(XPDEV_LIB)
$(DELFILES): $(XPDEV_LIB) $(SMBLIB) $(DELFILES): $(XPDEV_LIB) $(SMBLIB)
$(DUPEFIND): $(XPDEV_LIB) $(SMBLIB) $(DUPEFIND): $(XPDEV_LIB) $(SMBLIB)
$(DSTSEDIT): $(XPDEV_LIB)
$(READSAUCE): $(XPDEV_LIB) $(READSAUCE): $(XPDEV_LIB)
$(UPGRADE_TO_V319): $(XPDEV_LIB) $(SMBLIB) $(UPGRADE_TO_V319): $(XPDEV_LIB) $(SMBLIB)
$(UPGRADE_TO_V320): $(XPDEV_LIB) $(UPGRADE_TO_V320): $(XPDEV_LIB)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment