--- ray/src/util/SConscript	2003/10/21 19:27:29	1.1
+++ ray/src/util/SConscript	2005/09/19 11:30:11	1.12
@@ -2,69 +2,84 @@ import os
 
 Import('env') # inherit from parent
 
-# make a modified local copy
-util = env.Copy(LIBS=['rt'] + env['RAD_MLIB'])
+mlib = ['$RAD_MLIB']
+progs = []
 
 # compose paths
-def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
-def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
+def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
+def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
 
+Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
+
 # standard targets
 PROGS = [
-('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c')),
-('glarendx',  Split('glarendx.c')),
-('vwright',   Split('vwright.c')),
-('vwrays',    Split('vwrays.c')),
-('rad',       Split('rad.c')),
-('rpiece',    Split('rpiece.c Version.c')),
+('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'),
+	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
+('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],
+	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
+('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'],
+	['rtpic','rtargs','rtio','rtproc','rtcont','rtmem','rtpath','rtmath',
+	'rtnet','rterror','$RAD_SOCKETLIB']),
+('rtcontrib', ['rtcontrib.c', Version],
+	['rtpic','rtargs','rtfunc','rtio','rtproc','rtcont','rtmem','rtpath',
+	'rtmath','rtnet','rterror','$RAD_SOCKETLIB'])
 ]
-if os.name != 'nt': # XXX pending Windows version of netproc.c
-	PROGS.append(('ranimate',  Split('ranimate.c netproc.c')))
+
 for p in PROGS:
-    prog = util.Program(target=radbin(p[0]), source=p[1])
-    Default(prog)
-    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], prog)])
+	prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
+	progs.append(prog)
 
-if os.name != 'nt': # XXX pending resolution of free_os() conflict
+if os.name != 'nt': # XXX pending Windows version of raypcalls.c
 	# targets with different includes/libs
 	rs = Split('ranimove.c ranimove1.c ranimove2.c')
-	for l in ['raycalls', 'radiance']: # XXX ugly
-		rs.append(radlib(util['LIBPREFIX'] + l + util['LIBSUFFIX']))
-	ranimove = util.Program(target=radbin('ranimove'), source=rs,
-			CPPPATH=util.get('CPPPATH', []) + ['#src/rt'])
-	Default(ranimove)
-	env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], ranimove)])
+	ranimove = env.Program(target=radbin('ranimove'), source=rs,
+			CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
+			LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
+			'rtmath','rtcont','rtmem','rtargs','rtproc','rtpath','rterror'] + mlib)
+	progs.append(ranimove)
 
-getinfo = util.Program(target=radbin('getinfo'), source='getinfo.c',
-		LIBS=['rt'])
-Default(getinfo)
-env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], getinfo)])
+getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
+		LIBS=['rtio'])
+progs.append(getinfo)
 
-# special targets not normally built
-scanner = util.Program(target=radbin('scanner'), source='scanner.c', LIBS=['m'])
-makedist = util.Program(target=radbin('makedist'),
-		source=Split('makedist.c setscan.c'))
-scanner_i = util.Install(util['RAD_BINDIR'], scanner)
-makedist_i = util.Install(util['RAD_BINDIR'], makedist)
-util.Alias('util_special', [scanner, makedist])
-util.Alias('util_special_install', [scanner_i, makedist_i])
 
 # X11 targets
-if util.has_key('X11LIB'):
-    util.Append(CPPPATH=util['X11INCLUDE'])
-    util.Append(LIBS='X11')
-    util.Append(LIBPATH=util['X11LIB'])
-    xglaresrc = util.Program(target=radbin('xglaresrc'),
-			source=Split('xglaresrc.c x11findwind.c'),)
-    Default(xglaresrc)
-    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], xglaresrc)])
+if env.has_key('X11LIB'):
+	xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
+	xlibp = env.get('LIBPATH', []) + ['$X11LIB']
+	x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
+			CPPPATH=xincl)
+	xglaresrc = env.Program(target=radbin('xglaresrc'),
+			source=Split('xglaresrc.c') + [x11findwind],
+			LIBPATH=xlibp, CPPPATH=xincl,
+			LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
+	progs.append(xglaresrc)
 
-    # OpenGL targets that also depend on X11
-    if util.has_key('OGL'):
-        glrad = util.Program(target=radbin('glrad'), source=Split('glrad.c'),
-            CPPFLAGS=util.get('CPPFLAGS', []) + [util['RAD_STEREO']],
-            LIBS=['rgl', 'GL', 'GLU']+util['LIBS'],)
-        Default(glrad)
-        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], glrad)])
+	# OpenGL targets that also depend on X11
+	if env.has_key('OGL'):
+		glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
+			CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
+			LIBPATH=xlibp, CPPPATH=xincl,
+			LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
+			'rtmath','rtcont','rtmem','rterror',
+			'GL', 'GLU','X11'],)
+		progs.append(glrad)
 
+if os.name == 'posix': # XXX ignoring trad.wsh
+	for s in Split('''objview objline objpict
+			glare dayfact debugcal rlux raddepend compamb vinfo genambpos'''):
+		Default(env.InstallCsh(radbin(s), s + '.csh'))
+# Those don't really work yet
+#else:
+#	for s in Split('''objview glare rlux '''):
+#		prog = env.Program(target=radbin(s), source=s+'.c')
+#		progs.append(prog)
+
+Default('#src/util')
+env.Install('$RAD_BINDIR', progs)