diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile index 82686742fd2c0ed3c1b8901327b4d339e11990d7..4a3bcc77e5e1c977cad2096ba219bc2fdfcb3a52 100644 --- a/src/sbbs3/GNUmakefile +++ b/src/sbbs3/GNUmakefile @@ -20,7 +20,7 @@ include $(SRC_ROOT)/build/Common.gmake UTIL_LDFLAGS := $(LDFLAGS) UTIL_LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS) CONSOLE_LDFLAGS += $(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS) -UTIL_LIBS += $(SMBLIB_LIBS) +UTIL_LIBS += $(HASH_LIBS) ifndef bcc ifneq ($(os),sunos) @@ -121,7 +121,7 @@ $(SBBSMONO): $(MONO_OBJS) $(OBJS) $(SBBS): $(JS_DEPS) $(CRYPT_DEPS) $(OBJS) $(LIBS) $(EXTRA_SBBS_DEPENDS) $(ENCODE_LIB) | $(LIBODIR) @echo Linking $@ @echo $(ENCODE_LIB) - $(QUIET)$(MKSHPPLIB) $(LDFLAGS) -o $@ $(OBJS) $(SBBS_LIBS) $(SMBLIB_LIBS) $(LIBS) $(SHLIBOPTS) $(JS_LIBS) $(CRYPT_LIBS) $(ENCODE_LIBS) $(XPDEV-MT_LIBS) + $(QUIET)$(MKSHPPLIB) $(LDFLAGS) -o $@ $(OBJS) $(SBBS_LIBS) $(SMBLIB_LIBS) $(LIBS) $(SHLIBOPTS) $(JS_LIBS) $(CRYPT_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(XPDEV-MT_LIBS) # FTP Server Link Rule $(FTPSRVR): $(MTOBJODIR)/ftpsrvr.o @@ -151,7 +151,7 @@ $(SBBSCON): $(CON_OBJS) $(SBBS) $(FTPSRVR) $(WEBSRVR) $(MAILSRVR) $(SERVICES) # Baja Utility $(BAJA): $(BAJA_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(BAJA_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(BAJA_OBJS) $(XPDEV_LIBS) $(HASH_LIBS) # UnBaja Utility $(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR) @@ -166,22 +166,22 @@ $(NODE): $(NODE_OBJS) # FIXSMB Utility $(FIXSMB): $(FIXSMB_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(FIXSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # CHKSMB Utility $(CHKSMB): $(CHKSMB_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(CHKSMB_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SMB Utility $(SMBUTIL): $(SMBUTIL_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBUTIL_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SBBSecho (FidoNet Packet Tosser) $(SBBSECHO): $(SBBSECHO_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SBBSECHO_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SBBSecho Configuration Program $(ECHOCFG): $(ECHOCFG_OBJS) @@ -191,7 +191,7 @@ $(ECHOCFG): $(ECHOCFG_OBJS) # ADDFILES $(ADDFILES): $(ADDFILES_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(ADDFILES_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # FILELIST $(FILELIST): $(FILELIST_OBJS) @@ -201,7 +201,7 @@ $(FILELIST): $(FILELIST_OBJS) # MAKEUSER $(MAKEUSER): $(MAKEUSER_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # JSDOOR $(JSDOOR): $(JSDOOR_OBJS) $(SBBS) @@ -226,12 +226,12 @@ $(ASC2ANS): $(OBJODIR)/asc2ans.o # SEXYZ $(SEXYZ): $(SEXYZ_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) $(MT_LDFLAGS) -o $@ $(SEXYZ_OBJS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) $(MT_LDFLAGS) -o $@ $(SEXYZ_OBJS) $(HASH_LIBS) $(XPDEV-MT_LIBS) # QWKNODES $(QWKNODES): $(QWKNODES_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # SLOG $(SLOG): $(SLOG_OBJS) @@ -251,12 +251,12 @@ $(DELFILES): $(DELFILES_OBJS) # DUPEFIND $(DUPEFIND): $(DUPEFIND_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DUPEFIND_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(DUPEFIND_OBJS) $(HASH_LIBS) $(XPDEV_LIBS) # SMBACTIV $(SMBACTIV): $(SMBACTIV_OBJS) @echo Linking $@ - $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBACTIV_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) + $(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SMBACTIV_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) # DSTSEDIT $(DSTSEDIT): $(DSTSEDIT_OBJS) diff --git a/src/sbbs3/scfg/GNUmakefile b/src/sbbs3/scfg/GNUmakefile index 76ebc8d345d2f1102742cb20b0d6ed92787332f0..fb5045ad4f526f6c9b5a1c303ac986928fd43d9d 100644 --- a/src/sbbs3/scfg/GNUmakefile +++ b/src/sbbs3/scfg/GNUmakefile @@ -1,11 +1,11 @@ SRC_ROOT ?= ../.. include ${SRC_ROOT}/build/Common.gmake -CFLAGS += -DSCFG -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) -LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) +CFLAGS += -DSCFG -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) $(HASH_CFLAGS) +LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) vpath %.c .. $(SCFG): $(OBJS) @echo Linking $@ - ${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) -o$@ $(OBJS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) + ${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) -o$@ $(OBJS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) diff --git a/src/sbbs3/uedit/GNUmakefile b/src/sbbs3/uedit/GNUmakefile index 117842b608a73a3a9881c367c5623a615dd15a54..74b9ad644f37aa1725f9b43d395649aa774faf3b 100644 --- a/src/sbbs3/uedit/GNUmakefile +++ b/src/sbbs3/uedit/GNUmakefile @@ -22,9 +22,9 @@ endif vpath %.c .. -CFLAGS += -DHAS_CURSES -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) -LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) +CFLAGS += -DHAS_CURSES -I.. -I../../comio $(SMBLIB_CFLAGS) $(HASH_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) @echo Linking $@ - ${QUIET}$(CC) $(LDFLAGS) $(OBJS) -o $@ $(SMBLIB_LIBS) $(ENCODE_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) + ${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/umonitor/GNUmakefile b/src/sbbs3/umonitor/GNUmakefile index ecf4e76f7b888a5155a4bbabf4452124ee252ae5..4550a308f8298b48d147badf88c65e267dc26019 100644 --- a/src/sbbs3/umonitor/GNUmakefile +++ b/src/sbbs3/umonitor/GNUmakefile @@ -22,9 +22,9 @@ endif vpath %.c .. -CFLAGS += -I.. -I../../comio $(SMBLIB_CFLAGS) $(ENCODE_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) -LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) +CFLAGS += -I.. -I../../comio $(SMBLIB_CFLAGS) $(ENCODE_CFLAGS) $(HASH_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) $(UMONITOR): $(OBJS) @echo Linking $@ - $(QUIET)$(CC) $(LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(XPDEV-MT_LIBS) + $(QUIET)$(CC) $(LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) $(XPDEV-MT_LIBS) diff --git a/src/smblib/GNUmakefile b/src/smblib/GNUmakefile index cea1f44f1f3f00347001ee5751d88638c6e683c8..d07832fd60f028db83d98afaadf869fa6a86a7d3 100644 --- a/src/smblib/GNUmakefile +++ b/src/smblib/GNUmakefile @@ -17,7 +17,7 @@ SRC_ROOT = .. # Cross platform/compiler definitions include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules -CFLAGS += -I$(XPDEV_SRC) $(ENCODE_CFLAGS) +CFLAGS += -I$(XPDEV_SRC) $(ENCODE_CFLAGS) $(HASH_CFLAGS) # SMBLIB Library Link Rule diff --git a/src/syncterm/GNUmakefile b/src/syncterm/GNUmakefile index a5042e233a159cf47cb7bf05bef2a7b3523115ee..b5177c7c0107d9374960864042b394a390e51737 100644 --- a/src/syncterm/GNUmakefile +++ b/src/syncterm/GNUmakefile @@ -59,8 +59,8 @@ else endif CFLAGS += -DSYSTEM_LIST_DIR=\"${SYSTEM_LIST_DIR}\" -CFLAGS += $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) -I../sbbs3 -I../smblib -I../comio -LDFLAGS += $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(ENCODE_LDFLAGS) $(CRYPT_LDFLAGS) +CFLAGS += $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) $(HASH_CFLAGS) -I../sbbs3 -I../smblib -I../comio +LDFLAGS += $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(CRYPT_LDFLAGS) vpath %.c ../sbbs3 ../smblib ../uifc ../comio @@ -101,7 +101,7 @@ $(MTOBJODIR)$(DIRSEP)ciolib_res$(OFILE): $(SYNCTERM): $(CRYPT_DEPS) $(EXEODIR) $(OBJS) $(BUILD_DEPENDS) @echo Linking $@ - ${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(EXTRA_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) $(ENCODE_LIBS) + ${QUIET}$(CC) $(LDFLAGS) $(MT_LDFLAGS) $(OBJS) -o $@ $(UIFC-MT_LIBS) $(EXTRA_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS) $(ENCODE_LIBS) $(HASH_LIBS) ifeq ($(os),darwin) -${QUIET}mkdir $(EXEODIR)/SyncTERM.app -${QUIET}mkdir $(EXEODIR)/SyncTERM.app/Contents diff --git a/src/syncterm/objects.mk b/src/syncterm/objects.mk index c072164bb5c9dddb4ea2ea70480a74652d9299a6..12253fd5fd59bd78223c1158be6af1a6972e5f2f 100644 --- a/src/syncterm/objects.mk +++ b/src/syncterm/objects.mk @@ -11,11 +11,8 @@ OBJS = \ $(MTOBJODIR)$(DIRSEP)term$(OFILE) \ $(MTOBJODIR)$(DIRSEP)window$(OFILE) \ $(MTOBJODIR)$(DIRSEP)menu$(OFILE) \ - $(MTOBJODIR)$(DIRSEP)crc16$(OFILE) \ - $(MTOBJODIR)$(DIRSEP)crc32$(OFILE) \ $(MTOBJODIR)$(DIRSEP)zmodem$(OFILE) \ $(MTOBJODIR)$(DIRSEP)xmodem$(OFILE) \ - $(MTOBJODIR)$(DIRSEP)md5$(OFILE) \ $(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE) \ $(MTOBJODIR)$(DIRSEP)syncterm$(OFILE)