Changeset 1899 for trunk/src/Makefile


Ignore:
Timestamp:
08/25/10 16:11:40 (14 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: do make at ASAPROOT

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Makefile is updated to compile pyrap and link it when
build asap.
However, libpyrap is not used at the moment.


File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile

    r1898 r1899  
    4545# compiler flags
    4646CXXFLAGS += -fPIC
     47#CXXOPTS += -DHAVE_LIBPYRAP
    4748
    4849CFITSIOLIB := -lcfitsio
    … …  
    5455G2CLIB := -lgfortran
    5556
     57# pyrap
     58PYRAPD := $(ASAPROOT)/external/libpyrap
     59PYRAPLIBD := $(PYRAPD)
     60PYRAPINCD := $(PYRAPD)/pyrap-0.3.2
     61PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
     62
    5663# links to external libraries
    57 CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) \
     64CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB) \
    5865             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
    5966             -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
    … …  
    7683
    7784# DO NOT MODIFY AFTER THIS
    78 INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD)
     85INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
    7986LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)
    8087
Note: See TracChangeset for help on using the changeset viewer.