Changeset 1198 for trunk/src


Ignore:
Timestamp:
08/29/06 10:26:13 (18 years ago)
Author:
mar637
Message:

Merge from Release2.1.0b tag

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile

    r997 r1198  
    1 TARGET   := /tmp/_asap.so
     1TARGET   := _asap.so
    22
    33# the casa environment AIPSPATH has to be defined
    … …  
    1515# compiler flags
    1616CXXFLAGS := -fPIC -O3
    17 CXXFLAGS += -ansi -pedantic -Wno-long-long -Wall
     17CXXFLAGS += -ansi -Wno-long-long -Wall
    1818CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
    1919
    2020# darwin specific flags
    2121ifeq "$(CASAARCH)" "darwin"
    22    CXXFLAGS := -O2 -DAIPS_DARWIN
    23    CXXFLAGS += -ansi -pedantic -Wno-long-long -Wno-long-double
    24 endif
    25 
     22   CXXFLAGS +=-DAIPS_DARWIN
     23   CXXFLAGS += -Wno-long-double
     24endif
    2625
    2726# cfitsio
    28 CFITSIOROOT := /usr/local
    29 # If aips++ is build with LFS you need to have
     27CFITSIOROOT := /usr
     28# If aips++ is build with LFS (default) you need to have
    3029# libcfitsio with lfs support
     30# this is default in cfitsio >= 3.0
    3131CFITSIOINC := -I$(CFITSIOROOT)/include
    32 CFITSIOLIB := $(CFITSIOROOT)/lib/libcfitsio_lfs.a
    33 #CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
     32CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
    3433
    3534#rpfits
    3635RPFITSROOT := /usr/local
    3736RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
     37
     38G2CROOT := /usr
     39G2CLIB := $(G2CROOT)/lib -lg2c
    3840
    3941# This assumes all casa libs are static only (*.a)
    … …  
    4547             -ltables -lscimath -lscimath_f -lcasa  \
    4648             $(CASALIB)/libwcs.a \
    47              $(RPFITSLIB) $(CFITSIOLIB) -lg2c -lstdc++
     49             $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
    4850
    4951# darwin specific CASA flags
    … …  
    5961LDFLAGS   := -shared -Wl$(TARGET) -s
    6062ifeq "$(CASAARCH)" "darwin"
    61    LDFLAGS   := -dynamiclib -single_module
    62 endif
    63 
    64 # python only 2.3 has been tested
     63   LDFLAGS   := -bundle
     64endif
     65
     66# python
    6567PYVERSION := 2.3
    6668PYTHONROOT := /usr
    … …  
    6870PYTHONLIB := -L$(PYTHONROOT)/lib -lpython$(PYVERSION)
    6971
     72# use python universal build
     73ifeq "$(CASAARCH)" "darwin"
     74   PYVERSION := 2.4
     75   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
     76   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
     77   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
     78endif
     79
    7080# has to be build with same g++ version as casa
    7181BOOSTROOT := /usr
    … …  
    7989
    8090CCOBJECTS := MathUtils.o \
    81              MathUtils2.o \
     91             MathUtils2.o \
    8292             RowAccumulator.o \
    8393             Logger.o \
Note: See TracChangeset for help on using the changeset viewer.