Ticket #42886: patch-admin-Makefile.def.diff

File patch-admin-Makefile.def.diff, 1.1 KB (added by smaret (Sebastien Maret), 11 years ago)
  • admin/Makefile.def

    old new  
    231231# Fortran preprocessing
    232232
    233233# Preprocessor command
    234 CPP = cpp
     234CPP = @CPP@
    235235ifeq ($(GAG_OS_KIND),solaris)
    236236  CPP = /usr/ccs/lib/cpp
    237237endif
     
    309309# C compilation
    310310
    311311# C compiler name
    312 CC = gcc
    313 CXX = g++
     312CC = @CC@
     313CXX = @CXX@
    314314ifeq ($(GAG_OS_KIND),aix)
    315315  CC = xlc
    316316endif
     
    333333endif
    334334
    335335# GCC flags
    336 ifeq ($(CC),gcc)
     336ifeq ($(CC),@CC@)
    337337  # Generic to GCC
    338338  GLOBAL_CFLAGS += -pipe -fPIC
    339339  OPTION_CFLAGS += -Wall
     
    512512  # Compilation in 32 bits mode
    513513  GAG_32BITS_SWITCH = "-m32"
    514514endif
    515 STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CPP_EXT))
     515STDCpp_LIB += /usr/lib/libc++.dylib
    516516
    517517###########################################################################
    518518# Kernel libraries
    519519
    520 LEGACY_LIBS = -lslatec -llapack -lblas
     520LEGACY_LIBS = -lslatec -lLAPACK -lBLAS
    521521_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
    522522ifndef GAG_WIN32
    523523  GAG_LIBS = $(_GAG_LIBS)