/[ascend]/trunk/tcltk98/generic/interface/SConscript
ViewVC logotype

Diff of /trunk/tcltk98/generic/interface/SConscript

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 560 by johnpye, Sat Apr 29 08:53:04 2006 UTC revision 561 by johnpye, Thu May 4 07:35:43 2006 UTC
# Line 37  if tcl_env.get('STATIC_TCLTK'): Line 37  if tcl_env.get('STATIC_TCLTK'):
37      tcl_env.Append(LIBS=tcl_env['X11_LIB'])      tcl_env.Append(LIBS=tcl_env['X11_LIB'])
38      tcl_env.Append(LIBPATH=tcl_env['X11_LIBPATH'])      tcl_env.Append(LIBPATH=tcl_env['X11_LIBPATH'])
39    
40        if tcl_env['TKTABLE_LIBPATH']:
41            tcl_env.Append(LIBPATH=tcl_env['TKTABLE_LIBPATH'])
42    
43      tcl_env.Program("ascend4",["main.c"] + srcs)      tcl_env.Program("ascend4",["main.c"] + srcs)
44  else:  else:
45      print "DYNAMIC TCL/TK PROGRAM LINKAGE"      print "DYNAMIC TCL/TK PROGRAM LINKAGE"
# Line 48  else: Line 51  else:
51      if tcl_env.has_key('TK_LIBPATH'):      if tcl_env.has_key('TK_LIBPATH'):
52          tcl_env.Append(LIBPATH=tcl_env['TK_LIBPATH'])          tcl_env.Append(LIBPATH=tcl_env['TK_LIBPATH'])
53    
     if tcl_env['TKTABLE_LIBPATH']:  
         tcl_env.Append(LIBPATH=tcl_env['TKTABLE_LIBPATH'])  
   
54      ascendtcllib = tcl_env.SharedLibrary('ascendtcl',srcs+typelex)      ascendtcllib = tcl_env.SharedLibrary('ascendtcl',srcs+typelex)
55    
56      #tcl_so = tcl_env.Command(Copy('$SHLIBPREFIX$TCL_LIB$SHLIBSUFFIX','$TCL_LIBPATH/$SHLIBPREFIX$TCL_LIB$SHLIBSUFFIX'))      #tcl_so = tcl_env.Command(Copy('$SHLIBPREFIX$TCL_LIB$SHLIBSUFFIX','$TCL_LIBPATH/$SHLIBPREFIX$TCL_LIB$SHLIBSUFFIX'))
# Line 60  else: Line 60  else:
60      tcl_env.Append(LIBPATH=['.'])      tcl_env.Append(LIBPATH=['.'])
61    
62      ascendtclprog = tcl_env.Program("ascend4",["main.c"]      ascendtclprog = tcl_env.Program("ascend4",["main.c"]
63          , LIBS = ['$TCL_LIB','$TK_LIB','$TKTABLE_LIB','ascendtcl','ascend']          , LIBS = tcl_env['LIBS']+['ascendtcl','ascend']
64      )      )
65    
66      if tcl_env.get('CAN_INSTALL'):      if tcl_env.get('CAN_INSTALL'):

Legend:
Removed from v.560  
changed lines
  Added in v.561

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22