Commit 66d7c816 authored by rswindell's avatar rswindell
Browse files

libjs.a is now stored in ../../lib/mozilla/js/..., simplified definition of

directory/path names by using BUILD variable ("debug"/"release").
parent 3d8ec7b1
# GNUmakefile
#########################################################################
# Makefile for Synchronet BBS #
# 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 #
# #
......@@ -20,6 +20,12 @@ ifndef DEBUG
endif
endif
ifdef DEBUG
BUILD = "debug"
else
BUILD = "release"
endif
ifdef bcc
CC = bc++ -q
CCPRE := bcc
......@@ -56,8 +62,8 @@ else
endif
endif
LIBODIR := $(CCPRE).$(os).lib
EXEODIR := $(CCPRE).$(os).exe
LIBODIR := $(CCPRE).$(os).lib.$(BUILD)
EXEODIR := $(CCPRE).$(os).exe.$(BUILD)
DELETE = rm -f
......@@ -92,51 +98,12 @@ ifdef DEBUG
CFLAGS += -ggdb
endif
CFLAGS += -D_DEBUG
LIBODIR := $(LIBODIR).debug
EXEODIR := $(EXEODIR).debug
ifdef JSLIB
LIBS += $(JSLIB)
else
ifeq ($(os),freebsd)
LIBS += ../mozilla/js/src/FreeBSD4.3-RELEASE_DBG.OBJ/libjs.a
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
ifeq ($(os),sunos)
LIBS += ../mozilla/js/src/SunOS5.8_i86pc_DBG.OBJ/libjs.a
else
$(warning JavaScript library path for '$(os)' not defined.)
endif
endif
endif
endif
endif
else # RELEASE
LIBODIR := $(LIBODIR).release
EXEODIR := $(EXEODIR).release
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
ifdef JSLIB
LIBS += $(JSLIB)
else
LIBS += ../../lib/mozilla/js/$(os).$(BUILD)/libjs.a
endif
include targets.mk # defines all targets
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment