Deuce's beautifications and modifications to support OpenBSD.

src/sbbs3/GNUmakefile

@@ -14,17 +14,24 @@
 # $Id$
 
 # Macros
-DEBUG	=	1		# Comment out for release (non-debug) version
+ifndef DEBUG
+ ifndef RELEASE
+  DEBUG	:=	1
+ endif
+endif
+
 ifdef bcc
  CC		=	bc++ -q
+ CCPRE	:=	bcc
  CCPP	=	bc++ -q
  LD		=	ilink -q
-CFLAGS 	=	-D__unix__ -w-csu -w-pch -w-ccc -w-rch -w-par -w-aus
+ CFLAGS 	+=	-D__unix__ -w-csu -w-pch -w-ccc -w-rch -w-par -w-aus
 else
  CC		=	gcc
+ CCPRE	:=	gcc
  CCPP	=	g++
  LD		=	ld
-CFLAGS	=	-Wall
+ CFLAGS	+=	-Wall
 endif
 SLASH	=	/
 OFILE	=	o
@@ -33,31 +40,28 @@ LIBFILE	=	.a
 UIFC	=	../uifc/
 XPDEV	=	../xpdev/
 
-ifndef $(os)
-os		=	$(shell uname)
+ifndef os
+ os		:=	$(shell uname)
  $(warning OS not specified on command line, setting to '$(os)'.)
 endif
+os      :=	$(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
 
-ifeq ($(os),FreeBSD)	# FreeBSD
-LIBODIR	:=	gcc.freebsd.lib
-EXEODIR	:=	gcc.freebsd.exe
-else                    # Linux
-ifdef bcc
-LIBODIR	:=	bcc.linux.lib
-EXEODIR	:=	bcc.linux.exe
+ifeq ($(os),freebsd)
+ BSD	=	1
 else
-# -O doesn't work on FreeBSD (possible conflict with -g)
-# CFLAGS	+=	-O
-LIBODIR	:=	gcc.linux.lib
-EXEODIR	:=	gcc.linux.exe
+ ifeq ($(os),openbsd)
+  BSD	=	1
  endif
 endif
 
-DELETE	=	rm -fv
+LIBODIR :=	$(CCPRE).$(os).lib
+EXEODIR :=	$(CCPRE).$(os).exe
+
+DELETE	=	rm -f
 
 CFLAGS	+=	-DJAVASCRIPT -I../mozilla/js/src -I$(XPDEV) -I$(UIFC)
 
-ifeq ($(os),FreeBSD)	# FreeBSD
+ifdef BSD	# BSD
  CFLAGS	+=	-D_THREAD_SAFE
  # Math libraries needed and uses pthread
  LFLAGS	:=	-lm -pthread -lutil
@@ -70,7 +74,7 @@ LFLAGS	:=	-lm -lpthread -lutil
  endif
 endif
 
-ifeq ($(os),Linux)    # Linux
+ifeq ($(os),linux)    # Linux
  CFLAGS	+= -D_THREAD_SUID_BROKEN
 endif
 
@@ -78,23 +82,49 @@ ifdef DEBUG
  ifdef bcc
   CFLAGS	+=	-y -v -Od
  else
-CFLAGS	+=	-g
+  CFLAGS	+=	-ggdb
  endif
  CFLAGS  +=	-D_DEBUG
  LIBODIR	:=	$(LIBODIR).debug
  EXEODIR	:=	$(EXEODIR).debug
-ifeq ($(os),FreeBSD)	# FreeBSD
+
+ ifdef JSLIB
+  LIBS	+=	$(JSLIB)
+ else
+  ifeq ($(os),freebsd)
    LIBS	+=	../mozilla/js/src/FreeBSD4.3-RELEASE_DBG.OBJ/libjs.a
-else			# Linux
+  else
+   ifeq ($(os),openbsd)
+    LIBS	+=	../mozilla/js/src/OpenBSD3.1_DBG.OBJ/libjs.a
+   else
+    ifeq ($(os),linux)
      LIBS	+=	../mozilla/js/src/Linux_All_DBG.OBJ/libjs.a
+    else
+     $(warning JavaScript library path for '$(os)' not defined.)
     endif
+   endif
+  endif
+ endif
+
 else # RELEASE
  LIBODIR	:=	$(LIBODIR).release
  EXEODIR	:=	$(EXEODIR).release
-ifeq ($(os),FreeBSD)	# FreeBSD
+ ifdef JSLIB
+  LIBS	+=	$(JSLIB)
+ else
+  ifeq ($(os),freebsd)
    LIBS	+=	../mozilla/js/src/FreeBSD4.3-RELEASE_OPT.OBJ/libjs.a
   else
+   ifeq ($(os),openbsd)
+    LIBS	+=	../mozilla/js/src/OpenBSD3.1_OPT.OBJ/libjs.a
+   else
+    ifeq ($(os),linux)
      LIBS	+=	../mozilla/js/src/Linux_All_OPT.OBJ/libjs.a
+    else
+     $(warning JavaScript library path for '$(os)' not defined.)
+    endif
+   endif
+  endif
  endif
 endif
 
@@ -165,7 +195,7 @@ $(MAILSRVR): $(MAIL_OBJS) $(SBBSLIB)
 
 # Synchronet Console Build Rule
 $(SBBSCON): $(CON_OBJS) $(SBBSLIB)
-	$(CC) $(CFLAGS) -o $@ $^
+	@$(CC) $(CFLAGS) -o $@ $^
 
 # Specifc Compile Rules
 $(LIBODIR)/ftpsrvr.o: ftpsrvr.c ftpsrvr.h

src/sbbs3/scfg/GNUmakefile

@@ -14,7 +14,12 @@
 # $Id$
 
 # Macros
-DEBUG	=	1		# Comment out for release (non-debug) version
+ifndef DEBUG
+ ifndef RELEASE
+  DEBUG	:=	1
+ endif
+endif
+
 #USE_DIALOG =	1	# Dialog vesrion of UIFC
 USE_CURSES	=	1	# Curses version of UIFC
 CC		=	gcc
@@ -23,43 +28,39 @@ OFILE	=	o
 UIFC	=	../../uifc
 XPDEV	=	../../xpdev
 
-ifndef $(os)
+ifndef os
  os		=	$(shell uname)
  $(warning OS not specified on command line, setting to '$(os)'.)
 endif
+os      :=	$(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
 
-ifeq ($(os),FreeBSD)	# FreeBSD
-ODIR	:=	gcc.freebsd
-else                    # Linux
-ODIR	:=	gcc.linux
-endif
+ODIR	:=	gcc.$(os)
 
 LIBDIR	:=	/usr/lib
 DELETE	=	rm -f -v
 OUTLIB	=	-o
 
-CFLAGS	:=	-Wall -I$(UIFC) -I$(XPDEV) -I/usr/local/include -I../  -D_THREAD_SAFE
+CFLAGS	+=	-Wall -I$(UIFC) -I$(XPDEV) -I/usr/local/include -I../  -D_THREAD_SAFE
 
 LFLAGS	:=	-L/usr/local/lib
 
 ifdef USE_DIALOG
  LFLAGS	:=	$(LFLAGS) -L../../libdialog -ldialog -lcurses
-CFLAGS	:=	$(CFLAGS) -I../../libdialog -DUSE_DIALOG
+ CFLAGS	+=	-I../../libdialog -DUSE_DIALOG
 endif
 
 ifdef USE_CURSES
  LFLAGS	:=	$(LFLAGS) -lcurses
-CFLAGS	:=	$(CFLAGS) -DUSE_CURSES
+ CFLAGS	+=	-DUSE_CURSES
 endif
 
 # Math library needed
 LFLAGS	:=	$(LFLAGS) -lm
 
 ifdef DEBUG
-CFLAGS	:=	$(CFLAGS) -g -O0 -D_DEBUG 
+ CFLAGS	+=	-ggdb -O0 -D_DEBUG 
  ODIR	:=	$(ODIR).debug
 else # RELEASE
-LFLAGS	:=	$(LFLAGS)
  ODIR	:=	$(ODIR).release
 endif
 

src/xpdev/GNUmakefile

@@ -13,21 +13,30 @@
 # $Id$
 
 # Macros
-DEBUG	=	1		# Comment out for release (non-debug) version
+ifndef DEBUG
+ifndef RELEASE
+DEBUG	:=	1
+endif
+endif
+
 ifdef bcc
-CC	=	bc++
-CFLAGS	=	-q -w -D__unix__
+ CC		:=	bc++
+ CCPRE	:=	bcc
+ CFLAGS	+=	-q -w -D__unix__
 else
-CC	=	gcc
-CFLAGS	=	-Wall -O
+ CC		:=	gcc
+ CCPRE	:=	gcc
+ CFLAGS	+=	-Wall -O
 endif
+
 SLASH	=	/
 OFILE	=	o
 
-ifndef $(os)
+ifndef os
  os		=	$(shell uname)
  $(warning OS not specified on command line, setting to '$(os)'.)
 endif
+os      :=	$(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
 
 ifdef bcc
  ODIR	:=	bcc.$(os)
@@ -37,7 +46,11 @@ endif
 
 DELETE	=	rm -fv
 
-ifeq ($(os),FreeBSD)	# FreeBSD
+ifeq ($(os),freebsd)	# FreeBSD
+ CFLAGS	+= -D_THREAD_SAFE
+ LFLAGS	:=	-pthread
+else
+ ifeq ($(os),openbsd)	# OpenBSD
   CFLAGS	+= -D_THREAD_SAFE
   LFLAGS	:=	-pthread
  else					# Linux / Other UNIX
@@ -45,8 +58,9 @@ ifdef bcc
    LFLAGS	:=	libpthread.a
   else
    LFLAGS	:=	-lpthread
-endif
-endif
+  endif	!bcc
+ endif	!OpenBSD
+endif	!FreeBSD
 
 ifdef DEBUG
  ifdef bcc