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/external/libpyrap/Makefile

    r1895 r1899  
    1616CASAROOT := $(word 1, $(CASAPATH))
    1717CASAARCH := $(word 2, $(CASAPATH))
    18 ifeq "$(CASAARCH)" "darwin"
    19    CASADIST := /opt/casa
    20 else
    21    CASADIST := /usr/lib/casapy
    22 endif
    2318
    2419TARGET := libpyrap.so
     
    3833BOOSTLIB := -L$(BOOSTLIBD) -lboost_python
    3934
    40 # numpy (use numpy in CASA)
    41 NUMPYROOT := $(CASADIST)/lib/python2.5/site-packages/numpy
    42 NUMPYINCD := $(NUMPYROOT)/core/include
    43 NUMPYLIBD := $(NUMPYROOT)/core/
    44 NUMPYLIB := #-L$(NUMPYLIBD) -lmultiarray
    45 
    4635# python
    4736PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
    4837PYTHONINCD := $(PYTHONROOT)/include/python2.5
     38
     39# numpy (use numpy in CASA)
     40PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
     41NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
     42NUMPYINCD := $(NUMPYROOT)/core/include
    4943
    5044# the compiler
     
    6256
    6357# links to external libraries
    64 LIBS := $(CORELIB) $(BOOSTLIB) $(NUMPYLIB)
     58LIBS := $(CORELIB) $(BOOSTLIB)
    6559
    6660# include directories
     
    10397
    10498clean:
    105         rm -rf $(OBJECTS) $(TARGET)
    106         rm -rf $(TESTDIR)/$(TESTMOD) $(TESTDIR)/$(TESTOBJ)
     99        rm -f $(OBJECTS) $(TARGET)
     100        rm -f $(TESTDIR)/$(TESTMOD) $(TESTDIR)/$(TESTOBJ)
     101        rm -f $(INSTDIR)/$(TARGET)
    107102
    108103install:
Note: See TracChangeset for help on using the changeset viewer.