Fixed-up for Win32 builds - smb.lib is only linked with sbbs.dll, which exports

smb functions for other modules (sbbsmono and stand-alone utils excluded of course).

Fixed-up for Win32 builds - smb.lib is only linked with sbbs.dll, which exports
b3708a68 · rswindell · 4fc5e265 · b3708a68
Commit b3708a68 authored 20 years ago by rswindell
--- a/src/sbbs3/Makefile
+++ b/src/sbbs3/Makefile
-# Makefile
-
-#########################################################################
-# Makefile for Synchronet BBS for Unix									#
-# For use with GNU make and GNU C Compiler or Borland Kylix C++			#
-# @format.tab-size 4, @format.use-tabs true								#
-#																		#
-# gcc: gmake															#
-# Borland (still in testing/debuging stage): gmake bcc=1				#
-#																		#
-# Optional build targets: dlls, utils, mono, all (default)				#
-#########################################################################
-
-# $Id$
-
-SRC_ROOT	=	..
-!include $(SRC_ROOT)\build\Common.bmake
-
-UTIL_LDFLAGS	=	$(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS)
-CFLAGS	=	$(CFLAGS) -w-csu -w-par -w-aus
-MKSHLIB	=	$(CC) -WD
-
-# JS and NSPR setup stuff...
-CFLAGS = $(CFLAGS) -DJAVASCRIPT
-!ifdef JSINCLUDE
-CFLAGS = $(CFLAGS) -I$(JSINCLUDE)
-!else
-CFLAGS = $(CFLAGS) -I$(SRC_ROOT)$(DIRSEP)..$(DIRSEP)include$(DIRSEP)mozilla$(DIRSEP)js
-!endif
-!ifndef JSLIBDIR
-JSLIBDIR = $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)js$(DIRSEP)win32.$(BUILDPATH)
-!endif
-!ifndef JSLIB
-JSLIB	=	js32omf
-!endif
-!ifndef NSPRDIR
-# There *IS* no debug build in CVS
-# That's ok, looks like it doesn't need NSPR4
-#NSPRDIR = $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)win32.$(BUILDPATH)
-#NSPRDIR = $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)win32.release
-!endif
-JS_LDFLAGS = $(JS_LDFLAGS) $(JSLIBDIR)$(DIRSEP)$(UL_PRE)$(JSLIB)$(UL_SUF)
-# Looks like it doesn't need NSPR4
-#JS_LDFLAGS = $(JS_LDFLAGS) -L$(NSPRDIR) $(UL_PRE)nspr4$(UL_SUF)
-
-CFLAGS	=	$(CFLAGS) $(JS_CFLAGS)
-LDFLAGS	=	$(LDFLAGS) $(JS_LDFLAGS)
-
-!include sbbsdefs.mk
-MT_CFLAGS	=	$(MT_CFLAGS) $(SBBSDEFS)
-
-CON_LIBS	= $(UL_PRE)sbbs$(UL_SUF) $(UL_PRE)ftpsrvr$(UL_SUF) $(UL_PRE)websrvr$(UL_SUF) $(UL_PRE)mailsrvr$(UL_SUF) $(UL_PRE)services$(UL_SUF)
-
-CFLAGS	=	$(CFLAGS) $(UIFC-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(SMBLIB_CFLAGS) $(CIOLIB-MT_CFLAGS)
-LDFLAGS =	$(LDFLAGS) $(UIFC-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(SMBLIB_LDFLAGS) $(CIOLIB-MT_LDFLAGS)
-
-# Monolithic Synchronet executable Build Rule
-$(SBBSMONO): $(MONO_OBJS) $(OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(MT_LDFLAGS) -e$@ $(LDFLAGS) $(SMBLIB) $(XPDEV-MT_LIB)  @&&|
-	$** 
-|
-
-# Synchronet BBS library Link Rule
-$(SBBS): $(OBJS) $(LIBS)
-	@echo Linking $@
-	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) $(SMBLIB) $(XPDEV-MT_LIB) @&&|
-	$**
-|
-
-# FTP Server Link Rule
-$(FTPSRVR): $(FTP_OBJS)
-	@echo Linking $@
-	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) $(SMBLIB) $(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
-	$**
-|
-
-# Mail Server Link Rule
-$(MAILSRVR): $(MAIL_OBJS)
-	@echo Linking $@
-	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) $(SMBLIB) $(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
-	$**
-|
-
-# Mail Server Link Rule
-$(WEBSRVR): $(WEB_OBJS)
-	@echo Linking $@
-	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) $(SMBLIB) $(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
-	$**
-|
-
-# Services Link Rule
-$(SERVICES): $(SERVICE_OBJS)
-	@echo Linking $@
-	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) $(SMBLIB) $(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
-	$**
-|
-
-# Synchronet Console Build Rule
-$(SBBSCON): $(CON_OBJS) $(SBBS) $(FTPSRVR) $(WEBSRVR) $(MAILSRVR) $(SERVICES)
-	@echo Linking $@
-	$(QUIET)$(CC) $(MT_LDFLAGS) -e$@ $(LDFLAGS) $(CON_OBJS) $(CON_LIB) $(SMBLIB) $(XPDEV-MT_LIB) -L$(LIBODIR) $(LIBODIR)$(DIRSEP)sbbs.lib $(LIBODIR)$(DIRSEP)ftpsrvr.lib $(LIBODIR)$(DIRSEP)mailsrvr.lib $(LIBODIR)$(DIRSEP)websrvr.lib $(LIBODIR)$(DIRSEP)services.lib
-
-# Baja Utility
-$(BAJA): $(BAJA_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
-
-# Node Utility
-$(NODE): $(NODE_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
-
-# FIXSMB Utility
-$(FIXSMB): $(FIXSMB_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
-
-# CHKSMB Utility
-$(CHKSMB): $(CHKSMB_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
-
-# SMB Utility
-$(SMBUTIL): $(SMBUTIL_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
-
-# SBBSecho (FidoNet Packet Tosser)
-$(SBBSECHO): $(SBBSECHO_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
-
-# SBBSecho Configuration Program
-$(ECHOCFG): $(ECHOCFG_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) $(MT_LDFLAGS) -e$@ $** $(UIFC-MT_LDFLAGS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
-
-# ADDFILES
-$(ADDFILES): $(ADDFILES_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
-
-# FILELIST
-$(FILELIST): $(FILELIST_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
-
-# MAKEUSER
-$(MAKEUSER): $(MAKEUSER_OBJS)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
-
-# JSEXEC
-$(JSEXEC): $(JSEXEC_OBJS) $(SBBS)
-	@echo Linking $@
-	$(QUIET)$(CC) -e$@ $(LDFLAGS) $(JSEXEC_OBJS) $(SMBLIB) $(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)$(UL_PRE)sbbs$(UL_SUF)
-
-# ANS2ASC
-$(ANS2ASC): $(OBJODIR)$(DIRSEP)ans2asc$(OFILE)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $**
-
-# ASC2ANS
-$(ASC2ANS): $(OBJODIR)$(DIRSEP)asc2ans$(OFILE)
-	@echo Linking $@
-	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $**
-
-$(MTOBJODIR)$(DIRSEP)ftpsrvr$(OFILE): ftpsrvr.c
-        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DFTPSRVR_EXPORTS -USBBS_EXPORTS -n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
-
-$(MTOBJODIR)$(DIRSEP)mailsrvr$(OFILE): mailsrvr.c
-        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DMAILSRVR_EXPORTS -USBBS_EXPORTS -n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
-
-$(MTOBJODIR)$(DIRSEP)websrvr$(OFILE): websrvr.c
-        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DWEBSRVR_EXPORTS -USBBS_EXPORTS -n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
-
-$(MTOBJODIR)$(DIRSEP)services$(OFILE): services.c
-        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DSERVICES_EXPORTS -USBBS_EXPORTS -n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
-
+# Makefile
+
+#########################################################################
+# Makefile for Synchronet BBS for Win32									#
+# For use with Borland make and Borland C++	(or C++Builder)				#
+# @format.tab-size 4, @format.use-tabs true								#
+#########################################################################
+
+# $Id$
+
+SRC_ROOT	=	..
+!include $(SRC_ROOT)\build\Common.bmake
+
+UTIL_LDFLAGS	=	$(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS)
+CFLAGS	=	$(CFLAGS) -w-csu -w-par -w-aus
+MKSHLIB	=	$(CC) -WD
+
+# JS and NSPR setup stuff...
+CFLAGS = $(CFLAGS) -DJAVASCRIPT
+!ifdef JSINCLUDE
+	CFLAGS = $(CFLAGS) -I$(JSINCLUDE)
+!else
+	CFLAGS = $(CFLAGS) -I$(SRC_ROOT)$(DIRSEP)..$(DIRSEP)include$(DIRSEP)mozilla$(DIRSEP)js
+!endif
+!ifndef JSLIBDIR
+	JSLIBDIR = $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)js$(DIRSEP)win32.$(BUILDPATH)
+!endif
+!ifndef JSLIB
+	JSLIB	=	js32omf
+!endif
+!ifndef NSPRDIR
+	# There *IS* no debug build in CVS
+	# That's ok, looks like it doesn't need NSPR4
+	#NSPRDIR = $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)win32.$(BUILDPATH)
+	#NSPRDIR = $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)win32.release
+!endif
+JS_LDFLAGS = $(JS_LDFLAGS) $(JSLIBDIR)$(DIRSEP)$(UL_PRE)$(JSLIB)$(UL_SUF)
+# Looks like it doesn't need NSPR4
+#JS_LDFLAGS = $(JS_LDFLAGS) -L$(NSPRDIR) $(UL_PRE)nspr4$(UL_SUF)
+
+CFLAGS	=	$(CFLAGS) $(JS_CFLAGS)
+LDFLAGS	=	$(LDFLAGS) $(JS_LDFLAGS)
+
+!include sbbsdefs.mk
+MT_CFLAGS	=	$(MT_CFLAGS) $(SBBSDEFS)
+
+CON_LIBS	= $(UL_PRE)sbbs$(UL_SUF) $(UL_PRE)ftpsrvr$(UL_SUF) $(UL_PRE)websrvr$(UL_SUF) $(UL_PRE)mailsrvr$(UL_SUF) $(UL_PRE)services$(UL_SUF)
+
+CFLAGS	=	$(CFLAGS) $(UIFC-MT_CFLAGS) $(XPDEV-MT_CFLAGS) $(SMBLIB_CFLAGS) $(CIOLIB-MT_CFLAGS)
+LDFLAGS =	$(LDFLAGS) $(UIFC-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(SMBLIB_LDFLAGS) $(CIOLIB-MT_LDFLAGS)
+
+# Monolithic Synchronet executable Build Rule
+$(SBBSMONO): $(MONO_OBJS) $(OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(MT_LDFLAGS) -e$@ $(LDFLAGS) $(SMBLIB) $(XPDEV-MT_LIB)  @&&|
+	$** 
+|
+
+# Synchronet BBS library Link Rule
+$(SBBS): $(OBJS) $(LIBS)
+	@echo Linking $@
+	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) \
+		$(SMBLIB) $(XPDEV-MT_LIB) @&&|
+	$**
+|
+
+# FTP Server Link Rule
+$(FTPSRVR): $(FTP_OBJS)
+	@echo Linking $@
+	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) \
+		$(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
+	$**
+|
+
+# Mail Server Link Rule
+
+$(MAILSRVR): $(MAIL_OBJS)
+	@echo Linking $@
+	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) \
+		$(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
+	$**
+|
+
+# Mail Server Link Rule
+$(WEBSRVR): $(WEB_OBJS)
+	@echo Linking $@
+	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) \
+		$(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
+	$**
+|
+
+# Services Link Rule
+$(SERVICES): $(SERVICE_OBJS)
+	@echo Linking $@
+	$(QUIET)$(MKSHLIB) $(MT_LDFLAGS) -lGi -e$@ $(LDFLAGS) $(SHLIBOPTS) \
+		$(XPDEV-MT_LIB) $(LIBODIR)$(DIRSEP)sbbs.lib @&&|
+	$**
+|
+
+# Synchronet Console Build Rule
+$(SBBSCON): $(CON_OBJS) $(SBBS) $(FTPSRVR) $(WEBSRVR) $(MAILSRVR) $(SERVICES)
+	@echo Linking $@
+	$(QUIET)$(CC) $(MT_LDFLAGS) -e$@ $(LDFLAGS) $(CON_OBJS) $(CON_LIB) \
+		$(XPDEV-MT_LIB) -L$(LIBODIR) $(LIBODIR)$(DIRSEP)sbbs.lib \
+		$(LIBODIR)$(DIRSEP)ftpsrvr.lib $(LIBODIR)$(DIRSEP)mailsrvr.lib \
+		$(LIBODIR)$(DIRSEP)websrvr.lib $(LIBODIR)$(DIRSEP)services.lib
+
+# Baja Utility
+$(BAJA): $(BAJA_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
+
+# Node Utility
+$(NODE): $(NODE_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
+
+# FIXSMB Utility
+$(FIXSMB): $(FIXSMB_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
+
+# CHKSMB Utility
+$(CHKSMB): $(CHKSMB_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
+
+# SMB Utility
+$(SMBUTIL): $(SMBUTIL_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
+
+# SBBSecho (FidoNet Packet Tosser)
+$(SBBSECHO): $(SBBSECHO_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(SMBLIB_LIBS) $(XPDEV_LIBS)
+
+# SBBSecho Configuration Program
+$(ECHOCFG): $(ECHOCFG_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) $(MT_LDFLAGS) -e$@ $** \
+		$(UIFC-MT_LDFLAGS) $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)
+
+# ADDFILES
+$(ADDFILES): $(ADDFILES_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
+
+# FILELIST
+$(FILELIST): $(FILELIST_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
+
+# MAKEUSER
+$(MAKEUSER): $(MAKEUSER_OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $** $(XPDEV_LIBS)
+
+# JSEXEC
+$(JSEXEC): $(JSEXEC_OBJS) $(SBBS)
+	@echo Linking $@
+	$(QUIET)$(CC) -e$@ $(LDFLAGS) $(JSEXEC_OBJS) $(XPDEV-MT_LIB) \
+		$(LIBODIR)$(DIRSEP)$(UL_PRE)sbbs$(UL_SUF)
+
+# ANS2ASC
+$(ANS2ASC): $(OBJODIR)$(DIRSEP)ans2asc$(OFILE)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $**
+
+# ASC2ANS
+$(ASC2ANS): $(OBJODIR)$(DIRSEP)asc2ans$(OFILE)
+	@echo Linking $@
+	$(QUIET)$(CC) $(UTIL_LDFLAGS) -e$@ $**
+
+$(MTOBJODIR)$(DIRSEP)ftpsrvr$(OFILE): ftpsrvr.c
+        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DFTPSRVR_EXPORTS -DSMB_IMPORTS -USBBS_EXPORTS \
+			-n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
+
+$(MTOBJODIR)$(DIRSEP)mailsrvr$(OFILE): mailsrvr.c
+        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DMAILSRVR_EXPORTS -DSMB_IMPORTS -USBBS_EXPORTS \
+			-n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
+
+$(MTOBJODIR)$(DIRSEP)websrvr$(OFILE): websrvr.c
+        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DWEBSRVR_EXPORTS -DSMB_IMPORTS -USBBS_EXPORTS \
+			-n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
+
+$(MTOBJODIR)$(DIRSEP)services$(OFILE): services.c
+        $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -DSERVICES_EXPORTS -DSMB_IMPORTS -USBBS_EXPORTS \
+			-n$(MTOBJODIR) $(MT_CFLAGS) -c $** $(OUTPUT)$@
+