Removed NSPR build kludge.

This commit is contained in:
cls%seawood.org 1998-10-03 05:02:15 +00:00
parent b5b596a60a
commit e07ad99460
2 changed files with 0 additions and 28 deletions

View File

@ -22,10 +22,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
NSPRDIR = $(topsrcdir)/nsprpub
NSPR20 = 1
NSPR_MAKE_ARGS = -C $(NSPRDIR) DIST=`pwd`/dist NS_USE_GCC=$(GNU_CC) MOZILLA_CLIENT=$(MOZILLA_CLIENT) MOZ_DEBUG=$(MOZ_DEBUG) USE_PTHREADS=$(USE_PTHREADS) BUILD_OPT=$(BUILD_OPT) NO_MDUPDATE=$(NO_MDUPDATE) $@
ifndef NO_MOCHA
DIRS_JS = js
endif
@ -66,29 +62,7 @@ endif
include $(topsrcdir)/config/rules.mk
ifndef LOSE_NSPR
export:: envirocheck
$(MAKE) $(NSPR_MAKE_ARGS)
libs::
$(MAKE) $(NSPR_MAKE_ARGS)
install::
$(MAKE) $(NSPR_MAKE_ARGS)
clean::
$(MAKE) $(NSPR_MAKE_ARGS)
realclean::
$(MAKE) $(NSPR_MAKE_ARGS)
clobber::
$(MAKE) $(NSPR_MAKE_ARGS)
clobber_all::
$(MAKE) $(NSPR_MAKE_ARGS)
endif
# Running this rule assembles all the SDK source pieces into dist/sdk.
# You'll need to run this rule on every platform to get all the

View File

@ -301,9 +301,7 @@ LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX)
LIBMMEDIA = $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
NSPR20 = 1
ifndef USE_AUTOCONF
NSPRDIR = nsprpub
endif
DEFINES += -DNSPR20
INCLUDES += -I$(DIST)/include
LIBNSPR = $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX)