Changeset 1892

Timestamp:

08/24/10 11:55:12 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Makefile for pyrap updated.
It creates libpyrap.so, but not tested this library.

File:

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

trunk/external/libpyrap/Makefile

@@ -9 +9 @@
 #####
 EXTDIR := $(shell pwd)
+PYRAPROOT := $(EXTDIR)/pyrap-0.3.2/ 
 PYRAPDIR := $(EXTDIR)/pyrap-0.3.2/pyrap/Converters
 
@@ -15 +16 @@
 CASAARCH := $(word 2, $(CASAPATH))
 ifeq "$(CASAARCH)" "darwin"
+   CASADIST := /opt/casa
+else
    CASADIST := /usr/lib/casapy
-else
-   CASADIST := /opt/casa
 endif
 
+TARGET := libpyrap.so
+INSTDIR := $(CASAROOT)/$(CASAARCH)/lib
 
 # CASACORE 
+#COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
 COREINCD := $(CASAROOT)/$(CASAARCH)/include/casacore
 CORELIBD := $(CASAROOT)/$(CASAARCH)/lib
+CORELIB := -L$(CORELIBD) -lcasa_casa
 
-# boost include directory
-BOOSTINCD := 
-BOOSTLIBD :=
+# boost 
+BOOSTROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=BOOSTROOT eval_vars) && echo $$BOOSTROOT)
+BOOSTINCD := $(BOOSTROOT)/include
+BOOSTLIBD := $(BOOSTROOT)/lib
+BOOSTLIB := -L$(BOOSTLIBD) -lboost_python
 
-# numpy include directory (assume to use numpy in CASA)
+# 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
 
+# the compiler
+ifndef CXX
+   CXX      := g++
+endif
+
+# the linker
+LD := $(CXX)
+
+# compiler flags
+CXXFLAGS := -fPIC -O3 -g
+CXXFLAGS += -ansi -Wno-long-long -Wall
+CXXOPTS := -DAIPS_64B -DAIPS_USENUMPY
+
+# links to external libraries
+LIBS := $(CORELIB) $(BOOSTLIB) $(NUMPYLIB)
+
+# include directories
+INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) -I$(NUMPYINCD) \
+           -I$(PYRAPROOT) -I$(PYTHONINCD)
+
+# link option
+LDFLAGS := -shared 
 
 OBJECTS := $(PYRAPDIR)/PycArray.o \
            $(PYRAPDIR)/PycArrayNP.o \
            $(PYRAPDIR)/PycBasicData.o \
-           $(PYRAPDIR)/PycExp.o \
+           $(PYRAPDIR)/PycExcp.o \
            $(PYRAPDIR)/PycRecord.o \
            $(PYRAPDIR)/PycValueHolder.o #\
 #           $(PYRAPDIR)/PycArrayNA.o
 
-all:
+HEADERS := $(PYRAPDIR)/PycArrayComCC.h \
+           $(PYRAPDIR)/PycArrayComH.h \
+           $(PYRAPDIR)/PycArray.h \
+           $(PYRAPDIR)/PycArrayNP.h \
+           $(PYRAPDIR)/PycBasicData.h \
+           $(PYRAPDIR)/PycExcp.h \
+           $(PYRAPDIR)/PycRecord.h \
+           $(PYRAPDIR)/PycValueHolder.h #\
+#          $(PYRAPDIR)/PycArrayNA.h
+
+all: $(TARGET)
+
+.cc.o:
+        $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+
+$(TARGET): $(OBJECTS)
+        $(LD) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+
+$(OBJECTS): $(HEADERS)
+
+clean:
+        @rm -rf $(OBJECTS) $(TARGET)
+
+install:
+        @cp -f $(TARGET) $(INSTDIR)