--- ray/src/px/SConscript	2005/09/12 14:44:09	1.12
+++ ray/src/px/SConscript	2008/04/24 10:28:25	1.17
@@ -18,27 +18,27 @@ neuclrtab = env.Object(source="neuclrtab.c")
 PROGS = (
 # name          files            libs
 ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
-	['rtpic','rtproc','rtpath','rtio','rtargs','rtcont','rtmem','rterror']),
+	['rtpic','rtproc','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
 ('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d],
-	['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtcont','rtmem','rterror']),
+	['rtpic','rtproc','rtpath','rtargs','rtio','rtmath','rtcont','rtmem','rterror']),
 ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
-	['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
+	['rtlamps','rtpic','rtpath','rtargs','rtio','rtmath']),
 ('pcwarp',   ['pcwarp.c', warp3d], 	 
 	['rtpic','rtio','rtcont','rtmem','rterror']),
-('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
+('pvalue',   ['pvalue.c'],    ['rtpic','rtargs','rtio','rtmath']),
 ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
 ('psign',    ['psign.c'],
-	['rtpic','rtscene','rtio','rtpath','rtargs','rtcont','rtmem','rterror']),
+	['rtpic','rtscene','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
 ('protate',  ['protate.c'],   ['rtpic','rtio']),
 ('pextrem',  ['pextrem.c'],   ['rtpic','rtio']),
 ('pflip',    ['pflip.c'],     ['rtpic','rtio']),
 ('pcomb',    ['pcomb.c'],
-	['rtpic','rtproc','rtpath','rtio','rtfunc','rtargs','rtmath','rtcont','rtmem']),
+	['rtpic','rtproc','rtpath','rtfunc','rtargs','rtio','rtmath','rtcont','rtmem']),
 ('pinterp',  ['pinterp.c'],
-	['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']),
+	['rtproc','rtpic','rtpath','rtargs','rtio','rtmath','rtmem','rterror']),
 
 ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
-('ra_ps',    ['ra_ps.c'],     ['rtpic','rtio','rtargs','rtmem']),
+('ra_ps',    ['ra_ps.c'],     ['rtpic','rtargs','rtio','rtmem']),
 ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
 ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtproc','rtio','rtmem']),
 ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
@@ -65,14 +65,13 @@ if os.name == 'posix':
 		None,
 	[('cd "%(tiffdir)s"; '
 		'env CC="$CC" '
-		'./configure -C '#-with-CC="$CC" '
-		'"libdir=%(upperdir)s/lib" "includedir=%(upperdir)s/common" '
+		'./configure -C '
+		'"libdir=%(upperdir)s/lib" '
 		'--enable-static --disable-shared --disable-cxx '
-		'--enable-logluv --disable-jpeg '
-        '--disable-zlib --disable-pixarlog; '
-		#'"-with-ENVOPTS=$CCFLAGS"; '
+		'--enable-logluv --disable-jpeg --disable-zlib --disable-pixarlog; '
 		'cd %(portdir)s; make all;'
-		'cd %(libtiffdir)s; make install;') % {
+		'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'),
@@ -80,20 +79,12 @@ if os.name == 'posix':
 	}
 	])
 
-#	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')])
-
 	# 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)
 
@@ -102,7 +93,7 @@ if os.name == 'posix':
 if env.has_key('X11LIB'):
     xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
     xlibp = env.get('LIBPATH', []) + ['$X11LIB']
-    xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
+    xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
     x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
         CPPPATH=xincl)
 
@@ -116,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 ra_pfm'''):
+	for s in Split('''normpat falsecolor pdfblur pmblur pmdblur pbilat
+			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)