/[ascend]/trunk/tcltk98/jam/Jamrules.in
ViewVC logotype

Diff of /trunk/tcltk98/jam/Jamrules.in

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

revision 50 by jds, Thu Apr 7 23:59:22 2005 UTC revision 51 by jds, Sat May 14 01:33:48 2005 UTC
# Line 50  INSTALL_ROOT = $(prefix)$(SLASH)Ascend4_ Line 50  INSTALL_ROOT = $(prefix)$(SLASH)Ascend4_
50    
51  # name of the builder of the executable (in double quotes)  # name of the builder of the executable (in double quotes)
52  BUILD_CREDIT = "anonymous" ;  BUILD_CREDIT = "anonymous" ;
53                                    
54  # Root dir of Ascend base library sources.  # Root dir of Ascend base library sources.
55  ASC_BASE_ROOT = ..$(SLASH)..$(SLASH)base$(SLASH)generic ;  ASC_BASE_ROOT = ..$(SLASH)..$(SLASH)base$(SLASH)generic ;
56    
# Line 85  ASC_MODELS_DIR = ..$(SLASH)..$(SLASH)mod Line 85  ASC_MODELS_DIR = ..$(SLASH)..$(SLASH)mod
85  ASC_TK_DIR     = ..$(SLASH)TK ;  ASC_TK_DIR     = ..$(SLASH)TK ;
86    
87  ASC_BASE_LIBS =  ASC_BASE_LIBS =
88    $(ASC_BASE_LIBDIR)$(SLASH)$(BUILD_SUBDIR)$(SLASH)$(ASC_COMPILER_LIB)    $(ASC_BASE_LIBDIR)$(BUILD_SUBDIR)$(SLASH)$(ASC_COMPILER_LIB)
89    $(ASC_BASE_LIBDIR)$(SLASH)$(BUILD_SUBDIR)$(SLASH)$(ASC_GENERAL_LIB)    $(ASC_BASE_LIBDIR)$(BUILD_SUBDIR)$(SLASH)$(ASC_GENERAL_LIB)
90    $(ASC_BASE_LIBDIR)$(SLASH)$(BUILD_SUBDIR)$(SLASH)$(ASC_SOLVER_LIB)    $(ASC_BASE_LIBDIR)$(BUILD_SUBDIR)$(SLASH)$(ASC_SOLVER_LIB)
91    $(ASC_BASE_LIBDIR)$(SLASH)$(BUILD_SUBDIR)$(SLASH)$(ASC_UTILITIES_LIB)    $(ASC_BASE_LIBDIR)$(BUILD_SUBDIR)$(SLASH)$(ASC_UTILITIES_LIB)
92    $(ASC_BASE_LIBDIR)$(SLASH)$(BUILD_SUBDIR)$(SLASH)$(ASC_PACKAGES_LIB)    $(ASC_BASE_LIBDIR)$(BUILD_SUBDIR)$(SLASH)$(ASC_PACKAGES_LIB)
93    ;    ;
94    
95  #======================================================================  #======================================================================
# Line 171  TKTABLE_LIB_DIR ?= $(TCL_DIR)$(SLASH)lib Line 171  TKTABLE_LIB_DIR ?= $(TCL_DIR)$(SLASH)lib
171    
172  if $(NT)  if $(NT)
173  {  {
174    if ($(BCCROOT) || ($(TOOLSET) = BORLANDC))    if $(BCCROOT) || ( $(TOOLSET) = BORLANDC )
175    {    {
176      TCL_LIBRARY ?= tcl80_bc$(SUFLIB) ;      TCL_LIBRARY ?= tcl80_bc$(SUFLIB) ;
177      TK_LIBRARY  ?= tk80_bc$(SUFLIB) ;      TK_LIBRARY  ?= tk80_bc$(SUFLIB) ;
178      TKTABLE_LIB ?= tkTable_bc$(SUFLIB) ;      TKTABLE_LIB ?= tkTable_bc$(SUFLIB) ;
179    }    }
180    else if $(MSVCNT) || $(TOOLSET) = VISUALC)    else if $(MSVCNT) || ( $(TOOLSET) = VISUALC )
181    {    {
182      TCL_LIBRARY ?= tcl80$(SUFLIB) ;      TCL_LIBRARY ?= tcl80$(SUFLIB) ;
183      TK_LIBRARY  ?= tk80$(SUFLIB) ;      TK_LIBRARY  ?= tk80$(SUFLIB) ;
184      TKTABLE_LIB ?= tkTable$(SUFLIB) ;      TKTABLE_LIB ?= tkTable$(SUFLIB) ;
185    }    }
186    else if $(MINGW) || $(TOOLSET) = MINGW)    else if $(MINGW) || ( $(TOOLSET) = MINGW )
187    {    {
188      TCL_LIBRARY ?= libtcl80$(SUFLIB) ;      TCL_LIBRARY ?= libtcl80$(SUFLIB) ;
189      TK_LIBRARY  ?= libtk80$(SUFLIB) ;      TK_LIBRARY  ?= libtk80$(SUFLIB) ;
190      TKTABLE_LIB ?= libtkTable$(SUFLIB) ;      TKTABLE_LIB ?= libtkTable$(SUFLIB) ;
191    }    }
192    else if $(WATCOM) || $(TOOLSET) = WATCOM)    else if $(WATCOM) || ( $(TOOLSET) = WATCOM )
193    {    {
194      TCL_LIBRARY ?= tcl80_wat$(SUFLIB) ;      TCL_LIBRARY ?= tcl80_wat$(SUFLIB) ;
195      TK_LIBRARY  ?= tk80_wat$(SUFLIB) ;      TK_LIBRARY  ?= tk80_wat$(SUFLIB) ;

Legend:
Removed from v.50  
changed lines
  Added in v.51

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