diff options
| author | cls%seawood.org <devnull@localhost> | 1999-08-20 16:21:28 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 1999-08-20 16:21:28 +0000 |
| commit | 401eaa49bb1285c3572081c51abf22c3c0233e06 (patch) | |
| tree | 8cd8e2d334f414a5c90a06d366b0d088a65517ac | |
| parent | 99ad31be6958b134a7562b7f8e8cc49a57686f5a (diff) | |
| download | nspr-hg-unlabeled-3.9.8.tar.gz | |
Merged with HEAD from 8/18 or so.unlabeled-3.9.8
| -rw-r--r-- | lib/prstreams/Makefile | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile index eda13161..887bd73b 100644 --- a/lib/prstreams/Makefile +++ b/lib/prstreams/Makefile @@ -25,20 +25,27 @@ include $(MOD_DEPTH)/config/config.mk ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_RELEASE),4.1.3_U1) OPTIMIZER = + else + # The C++ compiler in Workshop 5.0 uses standard + # iostreams as default. -library=iostream will + # allow Workshop 5.0 to work with classic iostreams. + ifndef NS_USE_GCC + CCC_VERSION := $(shell $(CCC) -V 2>&1) + ifneq (,$(findstring 5.0,$(CCC_VERSION))) + CCC_ONLY_FLAGS += -library=iostream + endif + endif endif endif ifeq ($(OS_ARCH), IRIX) - CFLAGS += -KPIC ifneq ($(OS_RELEASE),5.3) - CFLAGS += -exceptions + CCC_ONLY_FLAGS += -exceptions endif endif -ifeq ($(OS_ARCH),HP-UX) - ifeq (($USE_64),1) - CCCFLAGS += +DA2.0W - endif +ifeq ($(OS_ARCH), BeOS) + CFLAGS += -frtti -fexceptions endif INCLUDES = -I$(DIST)/include @@ -105,6 +112,9 @@ endif ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif +ifeq ($(OS_ARCH),BeOS) + EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION) +endif ifeq ($(OS_ARCH), UNIXWARE) OS_LIBS += -lC @@ -167,5 +177,16 @@ endif export:: $(TARGETS) $(HEADERS) $(INSTALL) -m 444 $(HEADERS) $(DIST)/include $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib +ifeq ($(OS_ARCH),HP-UX) +ifdef SHARED_LIBRARY + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib +endif +endif +ifeq ($(OS_ARCH),OpenVMS) + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib +ifdef SHARED_LIBRARY + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib +endif +endif install:: export |