Changeset 1915 for trunk/src


Ignore:
Timestamp:
08/30/10 15:13:13 (14 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No (related to merge)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: make & make install

Put in Release Notes: No

Module(s): asap

Description: merged Wes's changes to Makefiles


File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile

    r1906 r1915  
    4444
    4545# compiler flags
    46 CXXFLAGS += -fPIC
    47 CXXOPTS += -DHAVE_LIBPYRAP
    48 
    49 CFITSIOLIB := -lcfitsio
    50 
    51 #rpfits
    52 RPFITSLIB := -lrpfits
    53 
    54 G2CROOT := /usr
    55 G2CLIB := -lgfortran
    56 
    57 # pyrap
     46CXXFLAGS += -fPIC -DHAVE_LIBPYRAP
     47
    5848PYRAPD := $(ASAPROOT)/external/libpyrap
    5949PYRAPLIBD := $(PYRAPD)
    … …  
    6151PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
    6252
     53
     54CFITSIOLIB := -lcfitsio
     55
     56#rpfits
     57RPFITSLIB := -lrpfits
     58
     59G2CROOT := /usr
     60G2CLIB := -lgfortran
     61
    6362# links to external libraries
    64 CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB) \
     63CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB)\
    6564             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
    6665             -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
    … …  
    8382
    8483# DO NOT MODIFY AFTER THIS
    85 INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
     84INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) $(addprefix -I, $(PYTHONINCD)) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
    8685LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)
    8786
Note: See TracChangeset for help on using the changeset viewer.