--- ray/src/util/SConscript	2003/10/27 10:35:43	1.2
+++ ray/src/util/SConscript	2004/07/06 11:49:10	1.6
@@ -9,17 +9,19 @@ def radbin(name): return os.path.join(env['RAD_BUILDBI
 def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
 
 setscan = env.Object(source='setscan.c')
+Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
 
 # standard targets
 PROGS = [
 ('findglare', Split('findglare.c glareval.c glaresrc.c')+[setscan],
 	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
+#('contour',   Split('contour.c'),  ['rtmath']), # XXX what is this?
 ('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
 ('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
 ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
 ('rad',       Split('rad.c'),
 	['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
-('rpiece',    Split('rpiece.c Version.c'),
+('rpiece',    Split('rpiece.c') + [Version],
 	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
 ]
 if os.name == 'nt': # XXX should be set in a *.cfg file
@@ -57,7 +59,8 @@ if os.name != 'nt': # XXX pending replacement of fork(
 			LIBS=mlib)
 	scanner_i = env.Install(env['RAD_BINDIR'], scanner)
 	makedist = env.Program(target=radbin('makedist'),
-			source=Split('makedist.c')+[setscan])
+			source=Split('makedist.c')+[setscan],
+			LIBS=['rtmath']+mlib)
 	makedist_i = env.Install(env['RAD_BINDIR'], makedist)
 	env.Alias('util_special', [scanner, makedist])
 	env.Alias('util_special_install', [scanner_i, makedist_i])
@@ -66,8 +69,10 @@ if os.name != 'nt': # XXX pending replacement of fork(
 if env.has_key('X11LIB'):
 	xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
 	xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
+	x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
+			CPPPATH=xincl)
 	xglaresrc = env.Program(target=radbin('xglaresrc'),
-			source=Split('xglaresrc.c x11findwind.c'),
+			source=Split('xglaresrc.c') + [x11findwind],
 			LIBPATH=xlibp, CPPPATH=xincl,
 			LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
 	Default(xglaresrc)