--- a/Make.proto	Fri Jul 19 22:08:27 1996 +0200
+++ b/Make.proto	Sat Jul 20 12:12:47 1996 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.70 1996-05-28 15:56:37 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.71 1996-07-20 10:12:47 cg Exp $
 #
 # -------------- no need to change anything below ----------
 
@@ -8,7 +8,8 @@
 LIBNAME=libview
 SMALLLIBNAME=libview_small
 STCOPT=$(LIBVIEW_STCOPT)
-STCLOCALOPT='-Pview-classes-(stx:libview)' $(COMMONSYMBOLS) +optspace2 $(SEPINITCODE) -Z$(LIBNAME)
+ZFLAG=-Z$(LIBNAME)
+STCLOCALOPT='-Pview-classes-(stx:libview)' $(COMMONSYMBOLS) +optspace2 $(SEPINITCODE) $(ZFLAG)
 LINKOBJRULE=$(SEPINITLINKOBJRULE)
 
 LOCALDEFS=-I$(XINCLUDE) $(XDEFS)
@@ -167,11 +168,17 @@
 #
 # special BIG-rule (kludge for HP / ibm)
 #
+
+#
+# also, XWorkstat and GLXWorkstat are separate (shared) Objects - compile without sepInitCode 
+# and without -Zlibview (to speedup ld.so on SGI, by avoiding conflicts)
+#
+
 XWorkstat.$(O):
-	$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=XWorkstat CC=$(CC) OPT="$(OPT)" SEPINITCODE=-sepInitCode
+	$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=XWorkstat CC=$(CC) OPT="$(OPT)" SEPINITCODE=-sepInitCode ZFLAG=
 
 GLXWorkstat.$(O):
-	$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=GLXWorkstat CC=$(CC) OPT="$(OPT)" SEPINITCODE=-sepInitCode
+	$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=GLXWorkstat CC=$(CC) OPT="$(OPT)" SEPINITCODE=-sepInitCode ZFLAG=
 
 DevWorkst.$(O):
 	$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=DevWorkst CC=$(CC) OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)"