Skip to content
Snippets Groups Projects
Commit 71f3a8d3 authored by rswindell's avatar rswindell
Browse files

Deuce's beautifications and modifications to support OpenBSD.

parent 9bb58bf3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/sbbs3/GNUmakefile
+ 94
− 64
View file @ 71f3a8d3
...@@ -14,17 +14,24 @@ ...@@ -14,17 +14,24 @@
# $Id$ # $Id$
# Macros # Macros
DEBUG = 1 # Comment out for release (non-debug) version ifndef DEBUG
ifndef RELEASE
DEBUG := 1
endif
endif
ifdef bcc ifdef bcc
CC = bc++ -q CC = bc++ -q
CCPRE := bcc
CCPP = bc++ -q CCPP = bc++ -q
LD = ilink -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 else
CC = gcc CC = gcc
CCPRE := gcc
CCPP = g++ CCPP = g++
LD = ld LD = ld
CFLAGS = -Wall CFLAGS += -Wall
endif endif
SLASH = / SLASH = /
OFILE = o OFILE = o
...@@ -33,31 +40,28 @@ LIBFILE = .a ...@@ -33,31 +40,28 @@ LIBFILE = .a
UIFC = ../uifc/ UIFC = ../uifc/
XPDEV = ../xpdev/ XPDEV = ../xpdev/
ifndef $(os) ifndef os
os = $(shell uname) os := $(shell uname)
$(warning OS not specified on command line, setting to '$(os)'.) $(warning OS not specified on command line, setting to '$(os)'.)
endif endif
os := $(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
ifeq ($(os),FreeBSD) # FreeBSD ifeq ($(os),freebsd)
LIBODIR := gcc.freebsd.lib BSD = 1
EXEODIR := gcc.freebsd.exe
else # Linux
ifdef bcc
LIBODIR := bcc.linux.lib
EXEODIR := bcc.linux.exe
else else
# -O doesn't work on FreeBSD (possible conflict with -g) ifeq ($(os),openbsd)
# CFLAGS += -O BSD = 1
LIBODIR := gcc.linux.lib
EXEODIR := gcc.linux.exe
endif endif
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) CFLAGS += -DJAVASCRIPT -I../mozilla/js/src -I$(XPDEV) -I$(UIFC)
ifeq ($(os),FreeBSD) # FreeBSD ifdef BSD # BSD
CFLAGS += -D_THREAD_SAFE CFLAGS += -D_THREAD_SAFE
# Math libraries needed and uses pthread # Math libraries needed and uses pthread
LFLAGS := -lm -pthread -lutil LFLAGS := -lm -pthread -lutil
...@@ -70,7 +74,7 @@ LFLAGS := -lm -lpthread -lutil ...@@ -70,7 +74,7 @@ LFLAGS := -lm -lpthread -lutil
endif endif
endif endif
ifeq ($(os),Linux) # Linux ifeq ($(os),linux) # Linux
CFLAGS += -D_THREAD_SUID_BROKEN CFLAGS += -D_THREAD_SUID_BROKEN
endif endif
...@@ -78,23 +82,49 @@ ifdef DEBUG ...@@ -78,23 +82,49 @@ ifdef DEBUG
ifdef bcc ifdef bcc
CFLAGS += -y -v -Od CFLAGS += -y -v -Od
else else
CFLAGS += -g CFLAGS += -ggdb
endif endif
CFLAGS += -D_DEBUG CFLAGS += -D_DEBUG
LIBODIR := $(LIBODIR).debug LIBODIR := $(LIBODIR).debug
EXEODIR := $(EXEODIR).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 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 LIBS += ../mozilla/js/src/Linux_All_DBG.OBJ/libjs.a
else
$(warning JavaScript library path for '$(os)' not defined.)
endif endif
endif
endif
endif
else # RELEASE else # RELEASE
LIBODIR := $(LIBODIR).release LIBODIR := $(LIBODIR).release
EXEODIR := $(EXEODIR).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 LIBS += ../mozilla/js/src/FreeBSD4.3-RELEASE_OPT.OBJ/libjs.a
else 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 LIBS += ../mozilla/js/src/Linux_All_OPT.OBJ/libjs.a
else
$(warning JavaScript library path for '$(os)' not defined.)
endif
endif
endif
endif endif
endif endif
...@@ -165,7 +195,7 @@ $(MAILSRVR): $(MAIL_OBJS) $(SBBSLIB) ...@@ -165,7 +195,7 @@ $(MAILSRVR): $(MAIL_OBJS) $(SBBSLIB)
# Synchronet Console Build Rule # Synchronet Console Build Rule
$(SBBSCON): $(CON_OBJS) $(SBBSLIB) $(SBBSCON): $(CON_OBJS) $(SBBSLIB)
$(CC) $(CFLAGS) -o $@ $^ @$(CC) $(CFLAGS) -o $@ $^
# Specifc Compile Rules # Specifc Compile Rules
$(LIBODIR)/ftpsrvr.o: ftpsrvr.c ftpsrvr.h $(LIBODIR)/ftpsrvr.o: ftpsrvr.c ftpsrvr.h
......
src/sbbs3/scfg/GNUmakefile
+ 23
− 22
View file @ 71f3a8d3
...@@ -14,7 +14,12 @@ ...@@ -14,7 +14,12 @@
# $Id$ # $Id$
# Macros # 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_DIALOG = 1 # Dialog vesrion of UIFC
USE_CURSES = 1 # Curses version of UIFC USE_CURSES = 1 # Curses version of UIFC
CC = gcc CC = gcc
...@@ -23,43 +28,39 @@ OFILE = o ...@@ -23,43 +28,39 @@ OFILE = o
UIFC = ../../uifc UIFC = ../../uifc
XPDEV = ../../xpdev XPDEV = ../../xpdev
ifndef $(os) ifndef os
os = $(shell uname) os = $(shell uname)
$(warning OS not specified on command line, setting to '$(os)'.) $(warning OS not specified on command line, setting to '$(os)'.)
endif endif
os := $(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
ifeq ($(os),FreeBSD) # FreeBSD ODIR := gcc.$(os)
ODIR := gcc.freebsd
else # Linux
ODIR := gcc.linux
endif
LIBDIR := /usr/lib LIBDIR := /usr/lib
DELETE = rm -f -v DELETE = rm -f -v
OUTLIB = -o 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 LFLAGS := -L/usr/local/lib
ifdef USE_DIALOG ifdef USE_DIALOG
LFLAGS := $(LFLAGS) -L../../libdialog -ldialog -lcurses LFLAGS := $(LFLAGS) -L../../libdialog -ldialog -lcurses
CFLAGS := $(CFLAGS) -I../../libdialog -DUSE_DIALOG CFLAGS += -I../../libdialog -DUSE_DIALOG
endif endif
ifdef USE_CURSES ifdef USE_CURSES
LFLAGS := $(LFLAGS) -lcurses LFLAGS := $(LFLAGS) -lcurses
CFLAGS := $(CFLAGS) -DUSE_CURSES CFLAGS += -DUSE_CURSES
endif endif
# Math library needed # Math library needed
LFLAGS := $(LFLAGS) -lm LFLAGS := $(LFLAGS) -lm
ifdef DEBUG ifdef DEBUG
CFLAGS := $(CFLAGS) -g -O0 -D_DEBUG CFLAGS += -ggdb -O0 -D_DEBUG
ODIR := $(ODIR).debug ODIR := $(ODIR).debug
else # RELEASE else # RELEASE
LFLAGS := $(LFLAGS)
ODIR := $(ODIR).release ODIR := $(ODIR).release
endif endif
......
src/xpdev/GNUmakefile
+ 41
− 27
View file @ 71f3a8d3
...@@ -13,21 +13,30 @@ ...@@ -13,21 +13,30 @@
# $Id$ # $Id$
# Macros # Macros
DEBUG = 1 # Comment out for release (non-debug) version ifndef DEBUG
ifndef RELEASE
DEBUG := 1
endif
endif
ifdef bcc ifdef bcc
CC = bc++ CC := bc++
CFLAGS = -q -w -D__unix__ CCPRE := bcc
CFLAGS += -q -w -D__unix__
else else
CC = gcc CC := gcc
CFLAGS = -Wall -O CCPRE := gcc
CFLAGS += -Wall -O
endif endif
SLASH = / SLASH = /
OFILE = o OFILE = o
ifndef $(os) ifndef os
os = $(shell uname) os = $(shell uname)
$(warning OS not specified on command line, setting to '$(os)'.) $(warning OS not specified on command line, setting to '$(os)'.)
endif endif
os := $(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
ifdef bcc ifdef bcc
ODIR := bcc.$(os) ODIR := bcc.$(os)
...@@ -37,7 +46,11 @@ endif ...@@ -37,7 +46,11 @@ endif
DELETE = rm -fv 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 CFLAGS += -D_THREAD_SAFE
LFLAGS := -pthread LFLAGS := -pthread
else # Linux / Other UNIX else # Linux / Other UNIX
...@@ -45,8 +58,9 @@ ifdef bcc ...@@ -45,8 +58,9 @@ ifdef bcc
LFLAGS := libpthread.a LFLAGS := libpthread.a
else else
LFLAGS := -lpthread LFLAGS := -lpthread
endif endif !bcc
endif endif !OpenBSD
endif !FreeBSD
ifdef DEBUG ifdef DEBUG
ifdef bcc ifdef bcc
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment