--- a/Make.proto	Mon Feb 16 14:09:23 2009 +0100
+++ b/Make.proto	Tue Feb 17 09:38:32 2009 +0100
@@ -90,16 +90,21 @@
 STATIC_LIBOBJS  =   $(STATIC_STANDARD_LIB) $(PRIVATE_OBJS)
 LIBLIST         =   $(STANDARD_LIST) $(PRIVATE_LIBS)
 
-# XWorkstation went into libview
-#WORKSTAT1       =   XWorkstation
-#WORKSTAT2       =   GLXWorkstation
-EXTRA_UI_CLASSES=  
+WORKSTAT1       =   XWorkstation
+WORKSTAT2       =   GLXWorkstation
+EXTRA_UI_CLASSES=   $(WORKSTAT1) $(WORKSTAT2)
+
+EXTRA_UI_OBJ=\
+	$(OPTIONAL_XWORKSTATION_OBJ)   \
+	$(OPTIONAL_GLXWORKSTATION_OBJ)
 
-EXTRA_UI_OBJ=
+STATIC_EXTRA_UI_OBJ=\
+	$(STATIC_OPTIONAL_XWORKSTATION_OBJ) \
+	$(STATIC_OPTIONAL_GLXWORKSTATION_OBJ)
 
-STATIC_EXTRA_UI_OBJ=
-
-EXTRA_LINK_UI_OBJ=
+EXTRA_LINK_UI_OBJ=\
+	$(OPTIONAL_LINK_XWORKSTATION_OBJ)   \
+	$(OPTIONAL_LINK_GLXWORKSTATION_OBJ)
 
 OPTIONAL_LIBGL_TARGET   =   $(LIB_GL_TARGET)
 OPTIONAL_GL_LIB         =   $(LIB_GL)