--- ray/src/px/SConscript	2003/10/27 10:35:43	1.2
+++ ray/src/px/SConscript	2004/07/06 11:49:09	1.6
@@ -48,6 +48,7 @@ PROGS = (
 ('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_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']),
@@ -96,10 +97,11 @@ if os.name == 'posix':
 	cwd = os.getcwd()
 	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')])
+	[('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'),
@@ -116,26 +118,28 @@ if os.name == 'posix':
 # pixar format requires extra lib
 if env.has_key('PIXAR_LIB'):
     ra_pixar = env.Program(radbin('ra_pixar'), source=['ra_pixar.c'],
-		LIBS=['rtpic', env['PIXAR_LIB']])
+        LIBS=['rtpic', env['PIXAR_LIB']])
     Default(ra_pixar)
     env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)])
 
 
 # X11 targets
 if env.has_key('X11LIB'):
-    xcppp = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
+    xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
     xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
     xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
+    x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
+		CPPPATH=xincl)
 
     ximage = env.Program(target=radbin('ximage'),
         source=Split('x11image.c x11raster.c')+[clrtab],
-        CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
+        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
     Default(ximage)
     env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
 
     xshowtrace = env.Program(target=radbin('xshowtrace'),
-        source=Split('xshowtrace.c x11findwind.c'),
-        CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
+        source=Split('xshowtrace.c') + [x11findwind],
+        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
     Default(xshowtrace)
     env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])