--- a/Make.spec	Wed Jan 25 17:20:12 2017 +0000
+++ b/Make.spec	Wed Feb 01 21:42:41 2017 +0000
@@ -22,7 +22,7 @@
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
+#  -Dxxx       : defines passed to CC for inline C-code
 #  -Ixxx       : include path passed to CC for inline C-code
 #  +optspace   : optimized for space
 #  +optspace2  : optimized more for space
@@ -50,17 +50,6 @@
 # STCWARNINGS=-warnEOLComments
 STCWARNINGS=-warnNonStandard -warnUnused
 
-UNIX_CLASSES= \
-	FcConstants \
-	FcPattern \
-	XftFontDescription \
-	XEmbedContainerView \
-	XWorkstation \
-	GLXWorkstation \
-
-WIN32_CLASSES= \
-	WinWorkstation \
-
 COMMON_CLASSES= \
 	AbstractBackground \
 	AbstractBorder \
@@ -114,6 +103,7 @@
 	WindowEvent \
 	DeviceWorkstation \
 	DisplayRootView \
+	FixedPalette \
 	ImageMask \
 	MacFlatButtonBorder \
 	MappedPalette \
@@ -122,8 +112,7 @@
 	WidgetEvent \
 	WindowingTransformation \
 	XGraphicsContext \
-	FixedPalette \
-        FixedPaletteWithAlpha \
+	FixedPaletteWithAlpha \
 	MonoMappedPalette \
 	ShadowView \
 	View \
@@ -132,90 +121,102 @@
 	StandardSystemView \
 	ModalBox \
 
+UNIX_CLASSES= \
+	FcConstants \
+	FcPattern \
+	XftFontDescription \
+	XEmbedContainerView \
+	XWorkstation \
+	GLXWorkstation \
+
+WIN32_CLASSES= \
+	WinWorkstation \
+
 
 
 
+COMMON_OBJS= \
+    $(OUTDIR)AbstractBackground.$(O) \
+    $(OUTDIR)AbstractBorder.$(O) \
+    $(OUTDIR)Color.$(O) \
+    $(OUTDIR)Colormap.$(O) \
+    $(OUTDIR)Controller.$(O) \
+    $(OUTDIR)Cursor.$(O) \
+    $(OUTDIR)DeviceHandle.$(O) \
+    $(OUTDIR)DisplayTransform.$(O) \
+    $(OUTDIR)Event.$(O) \
+    $(OUTDIR)FontDescription.$(O) \
+    $(OUTDIR)GraphicsContext.$(O) \
+    $(OUTDIR)GraphicsDevice.$(O) \
+    $(OUTDIR)GraphicsMedium.$(O) \
+    $(OUTDIR)Image.$(O) \
+    $(OUTDIR)ImageReader.$(O) \
+    $(OUTDIR)KeyboardForwarder.$(O) \
+    $(OUTDIR)KeyboardMap.$(O) \
+    $(OUTDIR)ResourcePack.$(O) \
+    $(OUTDIR)WindowGroup.$(O) \
+    $(OUTDIR)WindowSensor.$(O) \
+    $(OUTDIR)stx_libview.$(O) \
+    $(OUTDIR)BeveledBorder.$(O) \
+    $(OUTDIR)BitmapFont.$(O) \
+    $(OUTDIR)Border.$(O) \
+    $(OUTDIR)ColorPalette.$(O) \
+    $(OUTDIR)CompoundFont.$(O) \
+    $(OUTDIR)Depth16Image.$(O) \
+    $(OUTDIR)Depth1Image.$(O) \
+    $(OUTDIR)Depth24Image.$(O) \
+    $(OUTDIR)Depth2Image.$(O) \
+    $(OUTDIR)Depth32Image.$(O) \
+    $(OUTDIR)Depth48Image.$(O) \
+    $(OUTDIR)Depth4Image.$(O) \
+    $(OUTDIR)Depth64Image.$(O) \
+    $(OUTDIR)Depth8Image.$(O) \
+    $(OUTDIR)DeviceGraphicsContext.$(O) \
+    $(OUTDIR)DisplaySurface.$(O) \
+    $(OUTDIR)Font.$(O) \
+    $(OUTDIR)Form.$(O) \
+    $(OUTDIR)GradientBackground.$(O) \
+    $(OUTDIR)HostGraphicsDevice.$(O) \
+    $(OUTDIR)ImageBackground.$(O) \
+    $(OUTDIR)MacButtonBorder.$(O) \
+    $(OUTDIR)NoBackground.$(O) \
+    $(OUTDIR)ScaleTransform.$(O) \
+    $(OUTDIR)SimpleBorder.$(O) \
+    $(OUTDIR)SolidBackground.$(O) \
+    $(OUTDIR)SynchronousWindowSensor.$(O) \
+    $(OUTDIR)ViewStyle.$(O) \
+    $(OUTDIR)WindowEvent.$(O) \
+    $(OUTDIR)DeviceWorkstation.$(O) \
+    $(OUTDIR)DisplayRootView.$(O) \
+    $(OUTDIR)FixedPalette.$(O) \
+    $(OUTDIR)ImageMask.$(O) \
+    $(OUTDIR)MacFlatButtonBorder.$(O) \
+    $(OUTDIR)MappedPalette.$(O) \
+    $(OUTDIR)RoundedBorder.$(O) \
+    $(OUTDIR)SimpleView.$(O) \
+    $(OUTDIR)WidgetEvent.$(O) \
+    $(OUTDIR)WindowingTransformation.$(O) \
+    $(OUTDIR)XGraphicsContext.$(O) \
+    $(OUTDIR)FixedPaletteWithAlpha.$(O) \
+    $(OUTDIR)MonoMappedPalette.$(O) \
+    $(OUTDIR)ShadowView.$(O) \
+    $(OUTDIR)View.$(O) \
+    $(OUTDIR)TopView.$(O) \
+    $(OUTDIR)PopUpView.$(O) \
+    $(OUTDIR)StandardSystemView.$(O) \
+    $(OUTDIR)ModalBox.$(O) \
+    $(OUTDIR)extensions.$(O) \
+
 UNIX_OBJS= \
-    $(OUTDIR_SLASH)FcConstants.$(O) \
-    $(OUTDIR_SLASH)FcPattern.$(O) \
-    $(OUTDIR_SLASH)XftFontDescription.$(O) \
-    $(OUTDIR_SLASH)XEmbedContainerView.$(O) \
-    $(OUTDIR_SLASH)XWorkstation.$(O) \
-    $(OUTDIR_SLASH)GLXWorkstation.$(O) \
+    $(OUTDIR)FcConstants.$(O) \
+    $(OUTDIR)FcPattern.$(O) \
+    $(OUTDIR)XftFontDescription.$(O) \
+    $(OUTDIR)XEmbedContainerView.$(O) \
+    $(OUTDIR)XWorkstation.$(O) \
+    $(OUTDIR)GLXWorkstation.$(O) \
 
 WIN32_OBJS= \
-    $(OUTDIR_SLASH)WinWorkstation.$(O) \
-
-COMMON_OBJS= \
-    $(OUTDIR_SLASH)AbstractBackground.$(O) \
-    $(OUTDIR_SLASH)AbstractBorder.$(O) \
-    $(OUTDIR_SLASH)Color.$(O) \
-    $(OUTDIR_SLASH)Colormap.$(O) \
-    $(OUTDIR_SLASH)Controller.$(O) \
-    $(OUTDIR_SLASH)Cursor.$(O) \
-    $(OUTDIR_SLASH)DeviceHandle.$(O) \
-    $(OUTDIR_SLASH)DisplayTransform.$(O) \
-    $(OUTDIR_SLASH)Event.$(O) \
-    $(OUTDIR_SLASH)FontDescription.$(O) \
-    $(OUTDIR_SLASH)GraphicsContext.$(O) \
-    $(OUTDIR_SLASH)GraphicsDevice.$(O) \
-    $(OUTDIR_SLASH)GraphicsMedium.$(O) \
-    $(OUTDIR_SLASH)Image.$(O) \
-    $(OUTDIR_SLASH)ImageReader.$(O) \
-    $(OUTDIR_SLASH)KeyboardForwarder.$(O) \
-    $(OUTDIR_SLASH)KeyboardMap.$(O) \
-    $(OUTDIR_SLASH)ResourcePack.$(O) \
-    $(OUTDIR_SLASH)WindowGroup.$(O) \
-    $(OUTDIR_SLASH)WindowSensor.$(O) \
-    $(OUTDIR_SLASH)stx_libview.$(O) \
-    $(OUTDIR_SLASH)BeveledBorder.$(O) \
-    $(OUTDIR_SLASH)BitmapFont.$(O) \
-    $(OUTDIR_SLASH)Border.$(O) \
-    $(OUTDIR_SLASH)ColorPalette.$(O) \
-    $(OUTDIR_SLASH)CompoundFont.$(O) \
-    $(OUTDIR_SLASH)Depth16Image.$(O) \
-    $(OUTDIR_SLASH)Depth1Image.$(O) \
-    $(OUTDIR_SLASH)Depth24Image.$(O) \
-    $(OUTDIR_SLASH)Depth2Image.$(O) \
-    $(OUTDIR_SLASH)Depth32Image.$(O) \
-    $(OUTDIR_SLASH)Depth48Image.$(O) \
-    $(OUTDIR_SLASH)Depth4Image.$(O) \
-    $(OUTDIR_SLASH)Depth64Image.$(O) \
-    $(OUTDIR_SLASH)Depth8Image.$(O) \
-    $(OUTDIR_SLASH)DeviceGraphicsContext.$(O) \
-    $(OUTDIR_SLASH)DisplaySurface.$(O) \
-    $(OUTDIR_SLASH)Font.$(O) \
-    $(OUTDIR_SLASH)Form.$(O) \
-    $(OUTDIR_SLASH)GradientBackground.$(O) \
-    $(OUTDIR_SLASH)HostGraphicsDevice.$(O) \
-    $(OUTDIR_SLASH)ImageBackground.$(O) \
-    $(OUTDIR_SLASH)MacButtonBorder.$(O) \
-    $(OUTDIR_SLASH)NoBackground.$(O) \
-    $(OUTDIR_SLASH)ScaleTransform.$(O) \
-    $(OUTDIR_SLASH)SimpleBorder.$(O) \
-    $(OUTDIR_SLASH)SolidBackground.$(O) \
-    $(OUTDIR_SLASH)SynchronousWindowSensor.$(O) \
-    $(OUTDIR_SLASH)ViewStyle.$(O) \
-    $(OUTDIR_SLASH)WindowEvent.$(O) \
-    $(OUTDIR_SLASH)DeviceWorkstation.$(O) \
-    $(OUTDIR_SLASH)DisplayRootView.$(O) \
-    $(OUTDIR_SLASH)ImageMask.$(O) \
-    $(OUTDIR_SLASH)MacFlatButtonBorder.$(O) \
-    $(OUTDIR_SLASH)MappedPalette.$(O) \
-    $(OUTDIR_SLASH)RoundedBorder.$(O) \
-    $(OUTDIR_SLASH)SimpleView.$(O) \
-    $(OUTDIR_SLASH)WidgetEvent.$(O) \
-    $(OUTDIR_SLASH)WindowingTransformation.$(O) \
-    $(OUTDIR_SLASH)XGraphicsContext.$(O) \
-    $(OUTDIR_SLASH)FixedPalette.$(O) \
-    $(OUTDIR_SLASH)FixedPaletteWithAlpha.$(O) \
-    $(OUTDIR_SLASH)MonoMappedPalette.$(O) \
-    $(OUTDIR_SLASH)ShadowView.$(O) \
-    $(OUTDIR_SLASH)View.$(O) \
-    $(OUTDIR_SLASH)TopView.$(O) \
-    $(OUTDIR_SLASH)PopUpView.$(O) \
-    $(OUTDIR_SLASH)StandardSystemView.$(O) \
-    $(OUTDIR_SLASH)ModalBox.$(O) \
-    $(OUTDIR_SLASH)extensions.$(O) \
+    $(OUTDIR)WinWorkstation.$(O) \
 
 
+