--- ray/src/px/SConscript	2004/11/05 22:15:43	1.9
+++ ray/src/px/SConscript	2006/03/10 19:40:13	1.15
@@ -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,6 +23,8 @@ 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], 	 
+	['rtpic','rtio','rtcont','rtmem','rterror']),
 ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
 ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
 ('psign',    ['psign.c'],
@@ -60,20 +59,32 @@ for p in PROGS:
 # tiff library (unix-specific for the moment)
 if os.name == 'posix':
 	cwd = os.getcwd()
+	upperdir = os.path.split(cwd)[0]
+
 	libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
-		'tiff/config.local',
-	[('cd "%s"; '
-	'sh ./configure -quiet -noninteractive '
-		'-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
-	'cd libtiff; '
-	'make install;') % os.path.join(cwd, 'tiff')])
+		None,
+	[('cd "%(tiffdir)s"; '
+		'env CC="$CC" '
+		'./configure -C '
+		'"libdir=%(upperdir)s/lib" '
+		'--enable-static --disable-shared --disable-cxx '
+		'--enable-logluv --disable-jpeg --disable-zlib --disable-pixarlog; '
+		'cd %(portdir)s; make all;'
+		'cd %(libtiffdir)s; make install-exec;' # don't install headers
+	 ) % {
+	'upperdir':upperdir,
+	'tiffdir':os.path.join(cwd, 'tiff'),
+	'portdir':os.path.join(cwd, 'tiff', 'port'),
+	'libtiffdir':os.path.join(cwd, 'tiff', 'libtiff')
+	}
+	])
 
 	# tiff programs
-	ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
+	ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
 		LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
 	progs.append(ra_tiff)
 
-	normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
+	normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
 		LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
 	progs.append(normtiff)
 
@@ -96,15 +107,15 @@ if env.has_key('X11LIB'):
         CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
     progs.append(xshowtrace)
 
-
 if os.name == 'posix': # XXX ignoring trad.wsh
-	for s in Split('''normpat falsecolor pdfblur
-			pmblur xyzimage phisto pdelta pgblur'''):
+	for s in Split('''normpat falsecolor pdfblur pmblur pmdblur
+			xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''):
 		Default(env.InstallCsh(radbin(s), s + '.csh'))
 # XXX probably needs fixing
 #else:
 #	for s in Split('''falsecolor'''):
 #		Default(env.InstallCsh(radbin(s), s + '.csh'))
+# ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
 
 Default('#src/px')
 env.Install('$RAD_BINDIR', progs)