--- ray/src/px/SConscript	2004/10/21 15:47:12	1.7
+++ ray/src/px/SConscript	2004/11/08 19:24:46	1.10
@@ -13,9 +13,6 @@ def radlib(name): return os.path.join('$RAD_BUILDLIB',
 warp3d = env.Object(source="warp3d.c")
 clrtab = env.Object(source="clrtab.c")
 neuclrtab = env.Object(source="neuclrtab.c")
-ciq = env.Object(source="ciq.c")
-cut = env.Object(source="cut.c")
-closest = env.Object(source="closest.c")
 
 # standard targets
 PROGS = (
@@ -26,7 +23,7 @@ PROGS = (
 	['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtcont','rtmem','rterror']),
 ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
 	['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
-('pcwarp',   ['pcwarp.c', warp3d],
+('pcwarp',   ['pcwarp.c', warp3d], 	 
 	['rtpic','rtio','rtcont','rtmem','rterror']),
 ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
 ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
@@ -40,20 +37,12 @@ PROGS = (
 ('pinterp',  ['pinterp.c'],
 	['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']),
 
-('oki20c',   ['oki20c.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
-('oki20',    ['oki20.c'], ['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
-
 ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
-('ra_pr',    Split('ra_pr.c biq.c')+ [ciq, cut, closest],
-	['rtpic','rtio','rtmem']),
-('ra_pr24',  ['ra_pr24.c'],   ['rtpic','rtio','rtmem']),
-('ra_avs',   ['ra_avs.c'],    ['rtpic','rtio','rtmem']),
 ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtio','rtargs','rtmem']),
 ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
-('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtio','rtmem']),
+('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtproc','rtio','rtmem']),
 ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
 ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
-('ra_bn',    ['ra_bn.c'],     ['rtpic','rtio','rtmem']),
 ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
 ('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
 ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
@@ -67,32 +56,6 @@ for p in PROGS:
     progs.append(prog)
 
 
-# special targets not normally built
-SPECIAL = (
-# name          files             libs
-('psum',       ['psum.c'],       ['rtpic','rtio']),
-#('panim',      ['panim.c'],      ['client','rpcsvc']),# missing externals
-
-('ra_im',      ['ra_im.c'],      ['rtproc','rtpath','rtio','rterror']),
-
-#('aedimage',   Split('aedimage.c')+[ciq, cut, closest],[]),# missing externals
-('t4027',      ['t4027.c'],      ['rtpic']),
-('paintjet',   ['paintjet.c'],   ['rtpic','rtio','rtmem']),
-('mt160r',     ['mt160r.c'],     ['rtpic','rtio','rtmem']),
-('greyscale',  ['greyscale.c'],  ['rtpic']),
-('colorscale', ['colorscale.c'], ['rtpic']),
-('d48c',       ['d48c.c'],       ['rtpic']),
-)
-specprogs = []
-specinst = []
-for p in SPECIAL:
-	prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
-	specprogs.append(prog)
-	specinst.append(env.Install('$RAD_BINDIR', prog))
-env.Alias('px_special', specprogs)
-env.Alias('px_special_install', specinst)
-
-
 # tiff library (unix-specific for the moment)
 if os.name == 'posix':
 	cwd = os.getcwd()
@@ -114,13 +77,6 @@ if os.name == 'posix':
 	progs.append(normtiff)
 
 
-# pixar format requires extra lib
-if env.has_key('PIXAR_LIB'):
-    ra_pixar = env.Program(radbin('ra_pixar'), source='ra_pixar.c',
-        LIBS=['rtpic', '$PIXAR_LIB'])
-    progs.append(ra_pixar)
-
-
 # X11 targets
 if env.has_key('X11LIB'):
     xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
@@ -139,19 +95,15 @@ if env.has_key('X11LIB'):
         CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
     progs.append(xshowtrace)
 
-# NeWS ?!?
-#    if env.has_key('OGL'):
-#        glimage = env.Program(target=radbin('glimage'),
-#            CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']],
-#            source=Split('glimage.c'),
-#            LIBS=['gl_s']+env['LIBS'],)
-#        progs.append(glimage)
 
-
 if os.name == 'posix': # XXX ignoring trad.wsh
 	for s in Split('''normpat falsecolor pdfblur
 			pmblur xyzimage phisto pdelta pgblur'''):
 		Default(env.InstallCsh(radbin(s), s + '.csh'))
+# XXX probably needs fixing
+#else:
+#	for s in Split('''falsecolor'''):
+#		Default(env.InstallCsh(radbin(s), s + '.csh'))
 
 Default('#src/px')
 env.Install('$RAD_BINDIR', progs)