Add more files to EXCEPTIONSFILES, needed at least on NetBSD.

3 files changed, 37 insertions, 36 deletions

diff --git a/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index d65f6a431e..5fe64ceae0 100644
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
@@ -35,25 +35,22 @@ TARGET=comp
 .INCLUDE :  settings.mk
 
 SLOFILES= \
-    $(SLO)$/buffer.obj      \
-    $(SLO)$/codegen.obj		\
-    $(SLO)$/dim.obj			\
+    $(EXCEPTIONSFILES)		\
+    $(SLO)$/buffer.obj		\
     $(SLO)$/exprgen.obj		\
     $(SLO)$/exprnode.obj	\
-    $(SLO)$/exprtree.obj	\
-    $(SLO)$/io.obj			\
+    $(SLO)$/io.obj		\
     $(SLO)$/loops.obj		\
-    $(SLO)$/parser.obj		\
     $(SLO)$/sbcomp.obj		\
-    $(SLO)$/scanner.obj		\
     $(SLO)$/symtbl.obj		\
     $(SLO)$/token.obj
 
 EXCEPTIONSFILES= \
-    $(SLO)$/codegen.obj     \
-    $(SLO)$/dim.obj         \
-    $(SLO)$/exprtree.obj    \
-    $(SLO)$/parser.obj
+    $(SLO)$/codegen.obj		\
+    $(SLO)$/dim.obj		\
+    $(SLO)$/exprtree.obj	\
+    $(SLO)$/parser.obj		\
+    $(SLO)$/scanner.obj
 
 # --- Targets --------------------------------------------------------------
 
diff --git a/basic/source/sample/makefile.mk b/basic/source/sample/makefile.mk
index 9aeb8e3534..5261f13cfe 100644
--- a/basic/source/sample/makefile.mk
+++ b/basic/source/sample/makefile.mk
@@ -40,6 +40,9 @@ CXXFILES = \
     object.cxx 		\
     collelem.cxx
 
+EXCEPTIONSFILES= \
+    $(OBJ)$/object.obj 	\
+    $(OBJ)$/collelem.obj
 
 OBJFILES = \
     $(OBJ)$/object.obj 	\
diff --git a/basic/source/sbx/makefile.mk b/basic/source/sbx/makefile.mk
index dfd8e72bf4..cc20080cbe 100644
--- a/basic/source/sbx/makefile.mk
+++ b/basic/source/sbx/makefile.mk
@@ -41,34 +41,35 @@ SRS1NAME=$(TARGET)
 SRC1FILES=	format.src
 
 SLOFILES=	\
-    $(SLO)$/sbxbase.obj	\
-    $(SLO)$/sbxres.obj  	\
-    $(SLO)$/sbxvalue.obj	\
-    $(SLO)$/sbxvals.obj	\
-    $(SLO)$/sbxvar.obj  	\
-    $(SLO)$/sbxarray.obj	\
-    $(SLO)$/sbxobj.obj	\
-    $(SLO)$/sbxcoll.obj	\
-    $(SLO)$/sbxexec.obj	\
-    $(SLO)$/sbxint.obj 	\
-    $(SLO)$/sbxlng.obj 	\
-    $(SLO)$/sbxsng.obj 	\
-    $(SLO)$/sbxmstrm.obj	\
-    $(SLO)$/sbxdbl.obj 	\
+    $(EXCEPTIONSFILES)	\
+    $(SLO)$/sbxbase.obj		\
+    $(SLO)$/sbxbool.obj		\
+    $(SLO)$/sbxbyte.obj		\
+    $(SLO)$/sbxchar.obj		\
+    $(SLO)$/sbxcoll.obj		\
     $(SLO)$/sbxcurr.obj 	\
-    $(SLO)$/sbxdate.obj	\
-    $(SLO)$/sbxstr.obj 	\
-    $(SLO)$/sbxbool.obj	\
-    $(SLO)$/sbxchar.obj	\
-    $(SLO)$/sbxbyte.obj	\
-    $(SLO)$/sbxuint.obj	\
-    $(SLO)$/sbxulng.obj	\
-    $(SLO)$/sbxform.obj	\
-    $(SLO)$/sbxscan.obj 	\
-    $(SLO)$/sbxdec.obj
+    $(SLO)$/sbxdec.obj		\
+    $(SLO)$/sbxform.obj		\
+    $(SLO)$/sbxint.obj 		\
+    $(SLO)$/sbxlng.obj 		\
+    $(SLO)$/sbxmstrm.obj	\
+    $(SLO)$/sbxobj.obj		\
+    $(SLO)$/sbxres.obj  	\
+    $(SLO)$/sbxsng.obj 		\
+    $(SLO)$/sbxuint.obj		\
+    $(SLO)$/sbxulng.obj		\
+    $(SLO)$/sbxvals.obj		\
+    $(SLO)$/sbxvar.obj
 
 
-EXCEPTIONSFILES=$(SLO)$/sbxarray.obj
+EXCEPTIONSFILES=	\
+    $(SLO)$/sbxarray.obj	\
+    $(SLO)$/sbxdate.obj		\
+    $(SLO)$/sbxdbl.obj 		\
+    $(SLO)$/sbxexec.obj		\
+    $(SLO)$/sbxscan.obj 	\
+    $(SLO)$/sbxstr.obj 		\
+    $(SLO)$/sbxvalue.obj	\
 
 # --- Targets -------------------------------------------------------------