Changeset 1877


Ignore:
Timestamp:
08/18/10 14:05:57 (14 years ago)
Author:
Kana Sugimoto
Message:

New Development: Yes

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): libatnf

Description:

Added make file in external-alma so that libatnf will be built from the codes there.


Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r1849 r1877  
    1212   ASAPROOT := $(shell pwd)
    1313endif
     14ATNFD := external-alma
    1415
    1516#PY := $(wildcard python/*.py)
     
    2728module:
    2829        @if ( test -f getsvnrev.sh ) ; then /bin/bash getsvnrev.sh ; fi
     30        @cd $(ASAPROOT)/$(ATNFD); make
    2931        @cd $(ASAPROOT)/src; make
    3032        @cd $(ASAPROOT)/apps; make
     
    4951        @cd $(ASAPROOT)/src; make clean
    5052        @cd $(ASAPROOT)/doc; make clean
     53        @cd $(ASAPROOT)/$(ATNFD); make realclean
    5154
    5255datadist:
  • trunk/src/Makefile

    r1850 r1877  
    88###    4. Comment-IN the definition of 'CXXOPTS'.
    99TARGET   := /tmp/_asap.so
     10
     11ifndef ASAPROOT
     12        ASAPROOT := $(abspath ..)
     13endif
     14ATNFD := external-alma
    1015
    1116# the casa environment AIPSPATH has to be defined
     
    2732CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
    2833CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
    29 #USELIB := lib64
    30 USELIB := lib
     34USELIB := lib64
    3135
    3236# the compiler
     
    98102
    99103# DO NOT MODIFY AFTER THIS
    100 INCDIRS   := -I. $(CASAINC)  $(CFITSIOINC) $(BOOSTINC) $(PYTHONINC)
     104INCDIRS   := -I. $(CASAINC)  $(CFITSIOINC) $(BOOSTINC) $(PYTHONINC) -I$(ASAPROOT)/$(ATNFD)
    101105LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)
    102106
Note: See TracChangeset for help on using the changeset viewer.