Changeset 1259 for trunk/src/Makefile


Ignore:
Timestamp:
09/11/06 15:10:05 (18 years ago)
Author:
mar637
Message:

Merge from Release2.1.0b tag

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r1198 r1259  
    2525
    2626# cfitsio
    27 CFITSIOROOT := /usr
    28 # If aips++ is build with LFS (default) you need to have
    29 # libcfitsio with lfs support
    30 # this is default in cfitsio >= 3.0
     27CFITSIOROOT := /usr/local
    3128CFITSIOINC := -I$(CFITSIOROOT)/include
    32 CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
     29CFITSIOLIB := -L$(CFITSIOROOT)/lib -lcfitsio
    3330
    3431#rpfits
     
    3633RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
    3734
    38 G2CROOT := /usr
    39 G2CLIB := $(G2CROOT)/lib -lg2c
     35G2CROOT := /usr/local
     36G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
     37G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
     38G2CLIB := $(G2CROOT)/lib/libgfortran.a $(G2CARCH)
    4039
    4140# This assumes all casa libs are static only (*.a)
     
    7978
    8079# has to be build with same g++ version as casa
    81 BOOSTROOT := /usr
     80BOOSTROOT := /usr/local
    8281BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
    8382BOOSTINC  := -I$(BOOSTROOT)/include/boost
     
    9291             RowAccumulator.o \
    9392             Logger.o \
     93             LineCatalog.o \
    9494             STAttr.o \
    9595             STHeader.o \
     
    124124             python_STFitEntry.o \
    125125             python_STWriter.o \
     126             python_LineCatalog.o \
    126127             python_asap.o
    127128
Note: See TracChangeset for help on using the changeset viewer.