Changeset 1899 for trunk/external

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:

• trunk/external/libpyrap/Makefile (modified) (4 diffs)

trunk/external/libpyrap/Makefile

@@ -16 +16 @@
 CASAROOT := $(word 1, $(CASAPATH))
 CASAARCH := $(word 2, $(CASAPATH))
-ifeq "$(CASAARCH)" "darwin"
-   CASADIST := /opt/casa
-else
-   CASADIST := /usr/lib/casapy
-endif
 
 TARGET := libpyrap.so
@@ -38 +33 @@
 BOOSTLIB := -L$(BOOSTLIBD) -lboost_python
 
-# numpy (use numpy in CASA)
-NUMPYROOT := $(CASADIST)/lib/python2.5/site-packages/numpy
-NUMPYINCD := $(NUMPYROOT)/core/include
-NUMPYLIBD := $(NUMPYROOT)/core/
-NUMPYLIB := #-L$(NUMPYLIBD) -lmultiarray 
-
 # python
 PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
 PYTHONINCD := $(PYTHONROOT)/include/python2.5
+
+# numpy (use numpy in CASA)
+PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
+NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
+NUMPYINCD := $(NUMPYROOT)/core/include
 
 # the compiler
@@ -62 +56 @@
 
 # links to external libraries
-LIBS := $(CORELIB) $(BOOSTLIB) $(NUMPYLIB)
+LIBS := $(CORELIB) $(BOOSTLIB)
 
 # include directories
@@ -103 +97 @@
 
 clean:
-        rm -rf $(OBJECTS) $(TARGET)
-        rm -rf $(TESTDIR)/$(TESTMOD) $(TESTDIR)/$(TESTOBJ)
+        rm -f $(OBJECTS) $(TARGET)
+        rm -f $(TESTDIR)/$(TESTMOD) $(TESTDIR)/$(TESTOBJ)
+        rm -f $(INSTDIR)/$(TARGET)
 
 install: