Remove the old/unused sbbsmono and showstats build target

Fix up the 'utils' target a bit

List all the add'l sub-build targets in 'help' output

src/sbbs3/GNUmakefile

@@ -8,7 +8,7 @@
 # gcc: gmake															#
 # Borland (still in testing/debuging stage): gmake bcc=1				#
 #																		#
-# Optional build targets: dlls, utils, mono, all (default)				#
+# Optional build targets: dlls, utils, all (default)					#
 #########################################################################
 
 PWD	:=	$(shell /bin/pwd)
@@ -20,10 +20,14 @@ help:
 	@echo "Synchronet build targets (multiple may be specified):"
 	@echo " 'all'         Build all libraries, utilities, and sbbs (the default)"
 	@echo " 'gitinfo'     Build GIT branch and hash information (header) files only"
+	@echo " 'utils'       Build console/TUI sysop utilities"
 	@echo " 'gtkutils'    Build graphical (GTK-based) sysop utilities"
 ifeq ($(os), linux)
 	@echo " 'setcap'      Set port bind capabilities (on Linux only, or use systemd)"
 endif
+	@echo
+	@echo "Additional/sub-build targets (multiple may be specified):"
+	@echo " 'sexyz', 'scfg', 'uedit', 'umonitor', 'jsdoor'"
 	@echo
 	@echo "Synchronet install/update targets (choose one):"
 	@echo " 'symlinks'    Update symbolic links in sbbs/exec directory (recommended)"
@@ -153,11 +157,6 @@ JSDOOR_OBJS	+= $(MTOBJODIR)/comio_nix$(OFILE)
 endif
 LDFLAGS +=	$(UIFC-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(SMBLIB_LDFLAGS) $(ENCODE_LDFLAGS) $(HASH_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(JS_LDFLAGS) $(CRYPT_LDFLAGS)
 
-# Monolithic Synchronet executable Build Rule
-$(SBBSMONO): $(MONO_OBJS) $(OBJS)
-	@echo Linking $@
-	$(QUIET)$(CXX) -o $@ $(LDFLAGS) $(MT_LDFLAGS) $(MONO_OBJS) $(OBJS) $(SBBS_LIBS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS) $(JS_LIBS) $(CRYPT_LIBS)
-
 # Synchronet BBS library Link Rule
 $(SBBS): $(JS_DEPS) $(CRYPT_DEPS) $(OBJS) $(LIBS) $(EXTRA_SBBS_DEPENDS) $(ENCODE_LIB) $(HASH_LIB) | $(LIBODIR)
 	@echo Linking $@
@@ -274,7 +273,7 @@ $(QWKNODES): $(QWKNODES_OBJS)
 	$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(QWKNODES_OBJS) $(SMBLIB_LIBS) $(XPDEV_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
 
 # SLOG
-$(SLOG): $(SLOG_OBJS)
+$(SLOG): $(SLOG_OBJS) $(SBBS)
 	@echo Linking $@
 	$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SLOG_OBJS) $(XPDEV_LIBS) -lsbbs
 
@@ -298,11 +297,6 @@ $(READSAUCE): $(READSAUCE_OBJS) $(OBJODIR) $(EXEODIR)
 	@echo Linking $@
 	$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(READSAUCE_OBJS) $(XPDEV_LIBS)
 
-# SHOWSTAT
-$(SHOWSTAT): $(SHOWSTAT_OBJS) $(OBJODIR) $(EXEODIR)
-	@echo Linking $@
-	$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(SHOWSTAT_OBJS) $(XPDEV_LIBS)
-
 # PKTDUMP
 $(PKTDUMP): $(PKTDUMP_OBJS) $(OBJODIR) $(EXEODIR)
 	@echo Linking $@

src/sbbs3/objects.mk

@@ -110,41 +110,25 @@ OBJS	=		$(LOAD_CFG_OBJS) \
 			$(MTOBJODIR)/ver$(OFILE)\
 			$(MTOBJODIR)/ssl$(OFILE)
 
-# Must add new additions to MONO_OBJS too!
 CON_OBJS	= $(MTOBJODIR)/sbbscon$(OFILE) \
 			$(MTOBJODIR)/sbbs_ini$(OFILE)
 
-# Must add new additions to MONO_OBJS too!
 FTP_OBJS	= $(MTOBJODIR)/ftpsrvr$(OFILE) \
 			$(MTOBJODIR)/nopen$(OFILE)
 
-# Must add new additions to MONO_OBJS too!
 MAIL_OBJS	= $(MTOBJODIR)/mailsrvr$(OFILE) \
 			$(MTOBJODIR)/mxlookup$(OFILE) \
  		  	$(MTOBJODIR)/mime$(OFILE) \
  		  	$(MTOBJODIR)/nopen$(OFILE) \
  		  	$(MTOBJODIR)/ars$(OFILE)
 
-# Must add new additions to MONO_OBJS too!
 WEB_OBJS	= $(MTOBJODIR)/websrvr$(OFILE) \
 			$(MTOBJODIR)/ars$(OFILE) \
 			$(MTOBJODIR)/ringbuf$(OFILE)
 
-# Must add new additions to MONO_OBJS too!
 SERVICE_OBJS	= $(MTOBJODIR)/services$(OFILE) \
 			$(MTOBJODIR)/sbbs_ini$(OFILE)
 
-MONO_OBJS	= \
-			$(MTOBJODIR)/ftpsrvr$(OFILE) \
-			$(MTOBJODIR)/mailsrvr$(OFILE) \
- 		  	$(MTOBJODIR)/mime$(OFILE) \
-			$(MTOBJODIR)/mxlookup$(OFILE) \
-			$(MTOBJODIR)/sbbs_ini$(OFILE) \
-			$(MTOBJODIR)/sbbscon$(OFILE) \
-			$(MTOBJODIR)/services$(OFILE) \
-			$(MTOBJODIR)/websrvr$(OFILE) \
-			$(MTOBJODIR)/ssl$(OFILE)
-
 BAJA_OBJS = \
 			$(OBJODIR)/baja$(OFILE) \
 			$(OBJODIR)/ars$(OFILE)

src/sbbs3/targets.mk

@@ -10,7 +10,6 @@ WEBSRVR		= $(LIBODIR)/$(LIBPREFIX)websrvr$(SOFILE)
 MAILSRVR	= $(LIBODIR)/$(LIBPREFIX)mailsrvr$(SOFILE)
 SERVICES	= $(LIBODIR)/$(LIBPREFIX)services$(SOFILE)
 SBBSCON		= $(EXEODIR)/sbbs$(EXEFILE)
-SBBSMONO	= $(EXEODIR)/sbbsmono$(EXEFILE)
 JSEXEC		= $(EXEODIR)/jsexec$(EXEFILE)
 JSDOOR		= $(EXEODIR)/jsdoor$(EXEFILE)
 NODE		= $(EXEODIR)/node$(EXEFILE)
@@ -44,7 +43,7 @@ UTILS		= $(FIXSMB) $(CHKSMB) \
 			  $(ANS2ASC) $(ASC2ANS)  $(UNBAJA) \
 			  $(QWKNODES) $(SLOG) \
 			  $(DELFILES) $(DUPEFIND) \
-			  $(SEXYZ) $(DSTSEDIT) $(READSAUCE) $(SHOWSTAT) \
+			  $(SEXYZ) $(DSTSEDIT) $(READSAUCE) \
 			  $(PKTDUMP) $(FMSGDUMP) $(UPGRADE_TO_V319) \
 			  $(UPGRADE_TO_V320)
 
@@ -59,9 +58,7 @@ console:	$(JS_DEPS) xpdev-mt smblib \
 		dlls \
 		$(SBBSCON) $(JSEXEC)
 
-utils:	smblib xpdev-mt xpdev ciolib-mt uifc-mt \
-		$(LIBODIR) $(OBJODIR) $(MTOBJODIR) $(EXEODIR) \
-		$(UTILS)
+utils:		scfg uedit umonitor $(UTILS)
 
 gtkutils: gtkmonitor gtkchat gtkuseredit gtkuserlist
 
@@ -69,10 +66,6 @@ dlls:	$(JS_DEPS) smblib xpdev-mt \
 		$(MTOBJODIR) $(LIBODIR) \
 		$(SBBS) $(FTPSRVR) $(MAILSRVR) $(SERVICES)
 
-mono:	xpdev-mt smblib \
-		$(MTOBJODIR) $(EXEODIR) \
-		$(SBBSMONO)
-
 .PHONY: scfg
 scfg:
 	$(MAKE) -C scfg $(MAKEFLAGS)
@@ -149,7 +142,6 @@ $(WEBSRVR):
 $(MAILSRVR):
 $(SERVICES): 
 $(SBBSCON): $(XPDEV-MT_LIB) $(SMBLIB)
-$(SBBSMONO): $(XPDEV-MT_LIB) $(SMBLIB)
 $(JSEXEC): $(XPDEV-MT_LIB) $(SMBLIB)
 $(JSDOOR): $(XPDEV-MT_LIB)
 $(NODE): $(XPDEV_LIB)
@@ -172,7 +164,6 @@ $(DELFILES): $(XPDEV_LIB) $(SMBLIB)
 $(DUPEFIND): $(XPDEV_LIB) $(SMBLIB)
 $(DSTSEDIT): $(XPDEV_LIB)
 $(READSAUCE): $(XPDEV_LIB)
-$(SHOWSTAT): $(XPDEV_LIB)
 $(UPGRADE_TO_V319): $(XPDEV_LIB) $(SMBLIB)
 $(UPGRADE_TO_V320): $(XPDEV_LIB)