Merged with HEAD from 8/18 or so. unlabeled-3.9.8
authorcls%seawood.org
Fri, 20 Aug 1999 16:21:28 +0000
branchunlabeled-3.9.8
changeset 763 f3c8fe30a23f
parent 643 01a246cce0b9
push idunknown
push userunknown
push dateunknown
Merged with HEAD from 8/18 or so.
lib/prstreams/Makefile
--- a/lib/prstreams/Makefile
+++ b/lib/prstreams/Makefile
@@ -20,30 +20,37 @@
 MOD_DEPTH = ../..
 
 include $(MOD_DEPTH)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 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
 
 HEADERS = *.h
 
 CSRCS = \
 	plvrsion.c \
@@ -100,16 +107,19 @@ endif
 # complain, but we would run into weird problems at run-time.
 # Therefore on these platforms, we link just the object files.
 ifeq ($(OS_ARCH),NCR)
     EXTRA_LIBS =
 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
 endif
 
 LIBRARY_NAME    = prstrms
 LIBRARY_VERSION = $(MOD_VERSION)
 
@@ -162,10 +172,21 @@ else
 endif
 #
 # Version information generation (end)
 #
 
 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