--- ray/src/meta/SConscript	2016/03/05 13:24:58	1.6
+++ ray/src/meta/SConscript	2016/03/10 21:43:23	1.7
@@ -35,52 +35,31 @@ libmeta = env.StaticLibrary(radlib('meta'),
 
 # standard targets
 PROGS = (
-('meta2bmp', Split('meta2bmp.c') +[rplot, palloc, plot] + common,
-	['rtproc','rtpath','rtpic','rtio', # proc/path/rtio for win_popen()
-	'rtcont','rtmem','rterror']),
-('meta2tga', Split('meta2tga.c') +[rplot, palloc, plot] + common,
-	['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
-	'rtcont','rtmem','rterror']),
-('pexpand',  Split('pexpand.c expand.c segment.c') +[palloc]+ common,
-	['rtcont','rtmem','rterror']),
-('psort',    Split('psort.c sort.c') +[palloc]+ common,
-	['rtpath','rtcont','rtmem','rterror']),
-('cv',       Split('cv.c cvhfio.c') + common,
-	['rtcont','rtmem','rterror']),
-('psmeta',   Split('psmeta.c psplot.c') + common,
-	['rtcont','rtmem','rterror']),
-('plotin',   [plotin, primout] + common,
-	['rtcont','rtmem','rterror']),
-('bgraph',   [bgraph, mgraph, mgvars],
-	['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
-	'rtfunc','rtcont','rtmem','meta','rterror']),
-('igraph',   [igraph, gcalc, cgraph, mgraph, mgvars],
-	['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
-	'rtfunc','rtcont','rtmem','meta','rterror']),
-('dgraph',   [dgraph, cgraph, mgvars],
-	['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
-	'rtfunc','rtcont','rtmem','rterror']),
-('gcomp',    [gcomp, gcalc, mgvars],
-	['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
-	'rtfunc','rtcont','rtmem','rterror']),
-('plot4',    Split('plot4.c') +[primout]+ common,
-	['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
-	'rtcont','rtmem','rterror']),
+('meta2bmp', Split('meta2bmp.c') +[rplot, palloc, plot] + common, ['rtrad']),
+('meta2tga', Split('meta2tga.c') +[rplot, palloc, plot] + common, ['rtrad']),
+('pexpand',  Split('pexpand.c expand.c segment.c') +[palloc]+ common,['rtrad']),
+('psort',    Split('psort.c sort.c') +[palloc]+ common, ['rtrad']),
+('cv',       Split('cv.c cvhfio.c') + common, ['rtrad']),
+('psmeta',   Split('psmeta.c psplot.c') + common, ['rtrad']),
+('plotin',   [plotin, primout] + common, ['rtrad']),
+('bgraph',   [bgraph, mgraph, mgvars], ['rtrad', 'meta']),
+('igraph',   [igraph, gcalc, cgraph, mgraph, mgvars], ['rtrad', 'meta']),
+('dgraph',   [dgraph, cgraph, mgvars], ['rtrad']),
+('gcomp',    [gcomp, gcalc, mgvars], ['rtrad']),
+('plot4',    Split('plot4.c') +[primout]+ common, ['rtrad']),
 )
 for p in PROGS:
 	prog = env.Program(target=radbin(p[0]), source=p[1],
-			LIBS=p[2]+env['RAD_MLIB'])
+			LIBS=p[2]+env['RAD_MLIB'], )
 	Default(prog)
 	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
 
-
-
 # X11 targets
 if env.has_key('X11LIB'):
 	x11meta = env.Program(radbin('x11meta'), [plotin, primout]+ common,
 		CPPPATH=env.get('CPPPATH',[])+[env['X11INCLUDE']],
 		LIBPATH=env.get('LIBPATH',[])+[env['X11LIB']],
-		LIBS=['rtcont','rtmem','rterror', 'X11'] + env['RAD_MLIB'])
+		LIBS=['rtrad', 'X11'] + env['RAD_MLIB'])
 	Default(x11meta)
 	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], x11meta)])