--- a/Make.proto	Thu Sep 14 16:49:25 2006 +0200
+++ b/Make.proto	Thu Sep 14 19:58:14 2006 +0200
@@ -1,8 +1,9 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.143 2006-09-14 14:16:16 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.144 2006-09-14 17:58:14 stefan Exp $
 #
 # -------------- no need to change anything below ----------
 
 TOP=..
+INCLUDE_TOP=$(TOP)/..
 SUBDIRS=
 
 LIB_BASE=$(LIBVIEW_BASE)
@@ -12,10 +13,12 @@
 STCOPT=$(LIBVIEW_STCOPT)
 ZFLAG=-varPrefix=$(LIBNAME)
 PACKAGE=$(MODULE):$(MODULE_DIR)
-STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) $(ZFLAG)
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
+STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) $(ZFLAG) $(LOCALINCLUDES)
 # STCLOCALOPT='-package=$(PACKAGE)' $(SEPINITCODE) $(ZFLAG)
 LINKOBJRULE=$(SEPINITLINKOBJRULE)
 
+
 LOCALDEFS=-I$(XINCLUDE) $(XDEFS) $(CC_3D_FLAGS)
 
 DELIVERBINARIES=lib*.o lib*.a lib*.so $(LIBVIEW_EXTRA_TARGETS)
@@ -103,6 +106,10 @@
 		CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize: 64000 -V" \
 		SEPINITCODE=-sepInitCode ZFLAG=
 
+XWorkstation.$(SO): XWorkstation.$(O)
+	$(MAKE) $(SHAREDLIBRULE) LIB=XWorkstation.$(SO) OBJS="XWorkstation.$(O)" LOCAL_SHARED_LIBS="-L$(X_LIB_DIR) $(LIB_XT) $(LIB_X)"
+
+
 __GLXWorkstation.$(O): GLXWorkstation.st $(INCLUDE)/XWorkstation.H $(INCLUDE)/DeviceWorkstation.H $(INCLUDE)/HostGraphicsDevice.H $(INCLUDE)/GraphicsDevice.H $(INCLUDE)/stc.h
 	$(MAKE) $(BIG_STFILE_RULE) BIG_FILE=GLXWorkstation \
 		CC="$(CC)" OPT="$(OPT)" \