--- ray/src/hd/SConscript	2004/11/08 19:24:46	1.4
+++ ray/src/hd/SConscript	2008/12/23 15:04:00	1.7
@@ -9,6 +9,7 @@ mlib = env['RAD_MLIB']
 viewbeams = env.Object(source='viewbeams.c')
 holo = env.Object(source='holo.c')
 holofile = env.Object(source='holofile.c')
+clumpbeams = env.Object(source='clumpbeams.c')
 Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
 
 
@@ -16,13 +17,15 @@ Version = env.Object(source='../rt/Version.c') # XXX .
 PROGS = (
 ('rholo', Split('''rholo.c rholo2.c rholo2l.c rholo3.c rholo4.c''')
 	 + [Version, holofile, holo, viewbeams],
-	['rtpic','rtio','rtproc','rtpath','rtargs','rtmath','rtmem','rterror']),
+	['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror']),
 ('rhpict', Split('rhpict.c rhpict2.c')+[Version, holofile, holo, viewbeams],
-	['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
-('rhcopy', Split('rhcopy.c clumpbeams.c') + [holofile, holo],
-	['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
+	['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
+('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
+	['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
 ('rhinfo', Split('rhinfo.c') + [holofile, holo],
 	['rtio','rtproc', 'rtmath','rterror']),
+('rhoptimize', Split('rhoptimize.c') + [clumpbeams, holofile, holo],
+	['rtio','rtproc', 'rtmath','rterror']),
 ('genrhgrid', Split('genrhgrid.c') + [holofile, holo],
  ['rtio','rtmath','rtproc','rterror']),
 )
@@ -35,7 +38,7 @@ if os.name != 'nt': # pending some major work...
 
 # display drivers
 if env.has_key('X11INCLUDE'):
-	xenv = env.Copy(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
+	xenv = env.Clone(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
 			LIBPATH=[env['X11LIB']] + env['LIBPATH'],)
 	# common objects
 	rhdisp = xenv.Object(source='rhdisp.c')
@@ -50,7 +53,7 @@ if env.has_key('X11INCLUDE'):
 	# XXX the .hdi extension will cause problems on Windows
 	xenv['PROGSUFFIX'] = '.hdi'
 
-	dlibs = ['rtpic','rtio','rtmath','rtcont','rtmem','rtargs','rterror']
+	dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror','rtdummy']
 	def make_hdi(p): # build them
 		obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
 		prog = xenv.Program(target=os.path.join(devdir, p[0]),