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

Diff of /trunk/jam/Jamrules.in

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

revision 129 by jds, Tue Dec 20 20:22:56 2005 UTC revision 216 by jds, Wed Jan 25 02:12:20 2006 UTC
# Line 116  KEEPOBJS = true ; Line 116  KEEPOBJS = true ;
116  #---------------------------------------------------------------------------  #---------------------------------------------------------------------------
117  # platform-independent options  # platform-independent options
118  #---------------------------------------------------------------------------  #---------------------------------------------------------------------------
119    
120  # sizeof(void*) - change value if not a typical 32-bit system  # sizeof(void*) - change value if not a typical 32-bit system
121  SIZEOF_VOIDPTR = 4 ;  # the following are defined by Autoconf, so uncomment if you don't have that:
122  CCFLAGS += $(PACKAGE_FLAGS) -DSIZEOF_VOID_P=$(SIZEOF_VOIDPTR) ;  # SIZEOF_VOID_P = 4 ;
123    # CCFLAGS += -DSIZEOF_VOID_P=$(SIZEOF_VOID_P) ;
124    
125    CCFLAGS += $(PACKAGE_FLAGS) ;
126    
127  if $(NODEBUG)  if $(NODEBUG)
128  {  {
# Line 268  else if $(UNIX) || $(OS) = LINUX Line 272  else if $(UNIX) || $(OS) = LINUX
272      # uncomment to select desired warning level and ansi-strictness      # uncomment to select desired warning level and ansi-strictness
273      CCWARN += -Wall ;      CCWARN += -Wall ;
274      CCWARN += -W ;      CCWARN += -W ;
275      CCWARN += -pedantic ;      #CCWARN += -pedantic ;
276      #CCWARN += -Wshadow ;      #CCWARN += -Wshadow ;
277      #CCWARN += -ansi ;      #CCWARN += -ansi ;
278      CCWARN += -std=c99 ;      CCWARN += -std=c99 ;
# Line 345  BUILD_DIR = $(BUILD_DIR_ROOT)$(BUILD_SUB Line 349  BUILD_DIR = $(BUILD_DIR_ROOT)$(BUILD_SUB
349  #======================================================================  #======================================================================
350  # Ascend base library names & paths  # Ascend base library names & paths
351  #======================================================================  #======================================================================
352  ASC_COMPILER_LIBROOT  = libasc_compiler ;  ASC_COMPILER_LIBROOT  = libasccompiler ;
353  ASC_GENERAL_LIBROOT   = libasc_general ;  ASC_GENERAL_LIBROOT   = libascgeneral ;
354  ASC_SOLVER_LIBROOT    = libasc_solver ;  ASC_SOLVER_LIBROOT    = libascsolver ;
355  ASC_UTILITIES_LIBROOT = libasc_utilities ;  ASC_UTILITIES_LIBROOT = libascutils ;
356  ASC_PACKAGES_LIBROOT  = libasc_packages ;  ASC_PACKAGES_LIBROOT  = libascpackages ;
357    
358  ASC_COMPILER_LIB  = $(ASC_COMPILER_LIBROOT)$(SUFLIB) ;  ASC_COMPILER_LIB  = $(ASC_COMPILER_LIBROOT)$(SUFLIB) ;
359  ASC_GENERAL_LIB   = $(ASC_GENERAL_LIBROOT)$(SUFLIB) ;  ASC_GENERAL_LIB   = $(ASC_GENERAL_LIBROOT)$(SUFLIB) ;
# Line 530  BUILD_LSODE ?= TRUE ; Line 534  BUILD_LSODE ?= TRUE ;
534  # Name & path to the blas library  # Name & path to the blas library
535  ASC_BLAS_LIBROOT = libblas ;  ASC_BLAS_LIBROOT = libblas ;
536  ASC_BLAS_LIB     = $(ASC_BLAS_LIBROOT)$(SUFLIB) ;  ASC_BLAS_LIB     = $(ASC_BLAS_LIBROOT)$(SUFLIB) ;
537  BLASLIB_PATH     = $(BUILD_DIR) ;  # uncomment the following if you are providing an external lsode library
538  BLASLIB = $(BLASLIB_PATH)$(SLASH)$(ASC_BLAS_LIB) ;  #BUILD_BLAS = FALSE ;
539    BLASLIB = $(BUILD_DIR)$(SLASH)blas$(SLASH)$(ASC_BLAS_LIB) ;
540    
541  # Name & path to the linpack library  # Name & path to the linpack library
542  ASC_LINPACK_LIBROOT = liblpak ;  ASC_LINPACK_LIBROOT = liblpak ;
543  ASC_LINPACK_LIB     = $(ASC_LINPACK_LIBROOT)$(SUFLIB) ;  ASC_LINPACK_LIB     = $(ASC_LINPACK_LIBROOT)$(SUFLIB) ;
544  LPAKLIB_PATH        = $(BUILD_DIR) ;  # uncomment the following if you are providing an external linpack library
545  LPAKLIB = $(LPAKLIB_PATH)$(SLASH)$(ASC_LINPACK_LIB) ;  #BUILD_LPAK = FALSE ;
546    LPAKLIB = $(BUILD_DIR)$(SLASH)linpack$(SLASH)$(ASC_LINPACK_LIB) ;
547    
548  # Name & path to the internal lsode library.  # Name & path to the internal lsode library.
549  if $(BUILD_LSODE) = TRUE  if $(BUILD_LSODE) = TRUE
# Line 545  if $(BUILD_LSODE) = TRUE Line 551  if $(BUILD_LSODE) = TRUE
551    Echo Building internal LSODE library ;    Echo Building internal LSODE library ;
552    ASC_LSOD_LIBROOT = liblsode ;    ASC_LSOD_LIBROOT = liblsode ;
553    ASC_LSOD_LIB     = $(ASC_LSOD_LIBROOT)$(SUFLIB) ;    ASC_LSOD_LIB     = $(ASC_LSOD_LIBROOT)$(SUFLIB) ;
554    LSODLIB_PATH     = $(BUILD_DIR) ;    LSODLIB = $(BUILD_DIR)$(SLASH)lsode$(SLASH)$(ASC_LSOD_LIB) ;
   LSODLIB = $(LSODLIB_PATH)$(SLASH)$(ASC_LSOD_LIB) ;  
555  }  }
556    
557  FOR_LIBS += $(LSODLIB) $(LPAKLIB) $(BLASLIB) $(F77_LIBS) ;  FOR_LIBS += $(LSODLIB) $(LPAKLIB) $(BLASLIB) $(F77_LIBS) ;

Legend:
Removed from v.129  
changed lines
  Added in v.216

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