Skip to content
Snippets Groups Projects
Commit 306a564d authored by rswindell's avatar rswindell
Browse files

Moved crc*.* and md5.* to src/hash (new hash lib). 

You'll need to perform a clean rebuild.
parent c651eea2
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/sbbs3/GNUmakefile
+ 13
− 13
View file @ 306a564d
...@@ -20,7 +20,7 @@ include $(SRC_ROOT)/build/Common.gmake ...@@ -20,7 +20,7 @@ include $(SRC_ROOT)/build/Common.gmake
UTIL_LDFLAGS := $(LDFLAGS) UTIL_LDFLAGS := $(LDFLAGS)
UTIL_LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS) UTIL_LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS)
CONSOLE_LDFLAGS += $(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS) CONSOLE_LDFLAGS += $(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS)
UTIL_LIBS += $(SMBLIB_LIBS) UTIL_LIBS += $(HASH_LIBS)
ifndef bcc ifndef bcc
ifneq ($(os),sunos) ifneq ($(os),sunos)
...@@ -121,7 +121,7 @@ $(SBBSMONO): $(MONO_OBJS) $(OBJS) ...@@ -121,7 +121,7 @@ $(SBBSMONO): $(MONO_OBJS) $(OBJS)
$(SBBS): $(JS_DEPS) $(CRYPT_DEPS) $(OBJS) $(LIBS) $(EXTRA_SBBS_DEPENDS) $(ENCODE_LIB) | $(LIBODIR) $(SBBS): $(JS_DEPS) $(CRYPT_DEPS) $(OBJS) $(LIBS) $(EXTRA_SBBS_DEPENDS) $(ENCODE_LIB) | $(LIBODIR)
@echo Linking $@ @echo Linking $@
@echo $(ENCODE_LIB) @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 # FTP Server Link Rule
$(FTPSRVR): $(MTOBJODIR)/ftpsrvr.o $(FTPSRVR): $(MTOBJODIR)/ftpsrvr.o
...@@ -151,7 +151,7 @@ $(SBBSCON): $(CON_OBJS) $(SBBS) $(FTPSRVR) $(WEBSRVR) $(MAILSRVR) $(SERVICES) ...@@ -151,7 +151,7 @@ $(SBBSCON): $(CON_OBJS) $(SBBS) $(FTPSRVR) $(WEBSRVR) $(MAILSRVR) $(SERVICES)
# Baja Utility # Baja Utility
$(BAJA): $(BAJA_OBJS) $(BAJA): $(BAJA_OBJS)
@echo Linking $@ @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 Utility
$(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR) $(UNBAJA): $(UNBAJA_OBJS) | $(OBJODIR) $(EXEODIR)
...@@ -166,22 +166,22 @@ $(NODE): $(NODE_OBJS) ...@@ -166,22 +166,22 @@ $(NODE): $(NODE_OBJS)
# FIXSMB Utility # FIXSMB Utility
$(FIXSMB): $(FIXSMB_OBJS) $(FIXSMB): $(FIXSMB_OBJS)
@echo Linking $@ @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 Utility
$(CHKSMB): $(CHKSMB_OBJS) $(CHKSMB): $(CHKSMB_OBJS)
@echo Linking $@ @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 # SMB Utility
$(SMBUTIL): $(SMBUTIL_OBJS) $(SMBUTIL): $(SMBUTIL_OBJS)
@echo Linking $@ @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 (FidoNet Packet Tosser)
$(SBBSECHO): $(SBBSECHO_OBJS) $(SBBSECHO): $(SBBSECHO_OBJS)
@echo Linking $@ @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 # SBBSecho Configuration Program
$(ECHOCFG): $(ECHOCFG_OBJS) $(ECHOCFG): $(ECHOCFG_OBJS)
...@@ -191,7 +191,7 @@ $(ECHOCFG): $(ECHOCFG_OBJS) ...@@ -191,7 +191,7 @@ $(ECHOCFG): $(ECHOCFG_OBJS)
# ADDFILES # ADDFILES
$(ADDFILES): $(ADDFILES_OBJS) $(ADDFILES): $(ADDFILES_OBJS)
@echo Linking $@ @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): $(FILELIST_OBJS) $(FILELIST): $(FILELIST_OBJS)
...@@ -201,7 +201,7 @@ $(FILELIST): $(FILELIST_OBJS) ...@@ -201,7 +201,7 @@ $(FILELIST): $(FILELIST_OBJS)
# MAKEUSER # MAKEUSER
$(MAKEUSER): $(MAKEUSER_OBJS) $(MAKEUSER): $(MAKEUSER_OBJS)
@echo Linking $@ @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): $(JSDOOR_OBJS) $(SBBS) $(JSDOOR): $(JSDOOR_OBJS) $(SBBS)
...@@ -226,12 +226,12 @@ $(ASC2ANS): $(OBJODIR)/asc2ans.o ...@@ -226,12 +226,12 @@ $(ASC2ANS): $(OBJODIR)/asc2ans.o
# SEXYZ # SEXYZ
$(SEXYZ): $(SEXYZ_OBJS) $(SEXYZ): $(SEXYZ_OBJS)
@echo Linking $@ @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): $(QWKNODES_OBJS) $(QWKNODES): $(QWKNODES_OBJS)
@echo Linking $@ @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): $(SLOG_OBJS) $(SLOG): $(SLOG_OBJS)
...@@ -251,12 +251,12 @@ $(DELFILES): $(DELFILES_OBJS) ...@@ -251,12 +251,12 @@ $(DELFILES): $(DELFILES_OBJS)
# DUPEFIND # DUPEFIND
$(DUPEFIND): $(DUPEFIND_OBJS) $(DUPEFIND): $(DUPEFIND_OBJS)
@echo Linking $@ @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): $(SMBACTIV_OBJS) $(SMBACTIV): $(SMBACTIV_OBJS)
@echo Linking $@ @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): $(DSTSEDIT_OBJS) $(DSTSEDIT): $(DSTSEDIT_OBJS)
......
src/sbbs3/scfg/GNUmakefile
+ 3
− 3
View file @ 306a564d
SRC_ROOT ?= ../.. SRC_ROOT ?= ../..
include ${SRC_ROOT}/build/Common.gmake include ${SRC_ROOT}/build/Common.gmake
CFLAGS += -DSCFG -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(ENCODE_CFLAGS) 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) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS)
vpath %.c .. vpath %.c ..
$(SCFG): $(OBJS) $(SCFG): $(OBJS)
@echo Linking $@ @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)
src/sbbs3/uedit/GNUmakefile
+ 3
− 3
View file @ 306a564d
...@@ -22,9 +22,9 @@ endif ...@@ -22,9 +22,9 @@ endif
vpath %.c .. vpath %.c ..
CFLAGS += -DHAS_CURSES -I.. -I../../comio $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) CFLAGS += -DHAS_CURSES -I.. -I../../comio $(SMBLIB_CFLAGS) $(HASH_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) LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS)
$(UEDIT): $(OBJS) $(UEDIT): $(OBJS)
@echo Linking $@ @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)
src/sbbs3/umonitor/GNUmakefile
+ 3
− 3
View file @ 306a564d
...@@ -22,9 +22,9 @@ endif ...@@ -22,9 +22,9 @@ endif
vpath %.c .. vpath %.c ..
CFLAGS += -I.. -I../../comio $(SMBLIB_CFLAGS) $(ENCODE_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) CFLAGS += -I.. -I../../comio $(SMBLIB_CFLAGS) $(ENCODE_CFLAGS) $(HASH_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) LDFLAGS += $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS)
$(UMONITOR): $(OBJS) $(UMONITOR): $(OBJS)
@echo Linking $@ @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)
src/smblib/GNUmakefile
+ 1
− 1
View file @ 306a564d
...@@ -17,7 +17,7 @@ SRC_ROOT = .. ...@@ -17,7 +17,7 @@ SRC_ROOT = ..
# Cross platform/compiler definitions # Cross platform/compiler definitions
include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules 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 # SMBLIB Library Link Rule
......
src/syncterm/GNUmakefile
+ 3
− 3
View file @ 306a564d
...@@ -59,8 +59,8 @@ else ...@@ -59,8 +59,8 @@ else
endif endif
CFLAGS += -DSYSTEM_LIST_DIR=\"${SYSTEM_LIST_DIR}\" 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 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) $(CRYPT_LDFLAGS) LDFLAGS += $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(CRYPT_LDFLAGS)
vpath %.c ../sbbs3 ../smblib ../uifc ../comio vpath %.c ../sbbs3 ../smblib ../uifc ../comio
...@@ -101,7 +101,7 @@ $(MTOBJODIR)$(DIRSEP)ciolib_res$(OFILE): ...@@ -101,7 +101,7 @@ $(MTOBJODIR)$(DIRSEP)ciolib_res$(OFILE):
$(SYNCTERM): $(CRYPT_DEPS) $(EXEODIR) $(OBJS) $(BUILD_DEPENDS) $(SYNCTERM): $(CRYPT_DEPS) $(EXEODIR) $(OBJS) $(BUILD_DEPENDS)
@echo Linking $@ @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) ifeq ($(os),darwin)
-${QUIET}mkdir $(EXEODIR)/SyncTERM.app -${QUIET}mkdir $(EXEODIR)/SyncTERM.app
-${QUIET}mkdir $(EXEODIR)/SyncTERM.app/Contents -${QUIET}mkdir $(EXEODIR)/SyncTERM.app/Contents
......
src/syncterm/objects.mk
+ 0
− 3
View file @ 306a564d
...@@ -11,11 +11,8 @@ OBJS = \ ...@@ -11,11 +11,8 @@ OBJS = \
$(MTOBJODIR)$(DIRSEP)term$(OFILE) \ $(MTOBJODIR)$(DIRSEP)term$(OFILE) \
$(MTOBJODIR)$(DIRSEP)window$(OFILE) \ $(MTOBJODIR)$(DIRSEP)window$(OFILE) \
$(MTOBJODIR)$(DIRSEP)menu$(OFILE) \ $(MTOBJODIR)$(DIRSEP)menu$(OFILE) \
$(MTOBJODIR)$(DIRSEP)crc16$(OFILE) \
$(MTOBJODIR)$(DIRSEP)crc32$(OFILE) \
$(MTOBJODIR)$(DIRSEP)zmodem$(OFILE) \ $(MTOBJODIR)$(DIRSEP)zmodem$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xmodem$(OFILE) \ $(MTOBJODIR)$(DIRSEP)xmodem$(OFILE) \
$(MTOBJODIR)$(DIRSEP)md5$(OFILE) \
$(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE) \ $(MTOBJODIR)$(DIRSEP)st_crypt$(OFILE) \
$(MTOBJODIR)$(DIRSEP)syncterm$(OFILE) $(MTOBJODIR)$(DIRSEP)syncterm$(OFILE)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment