Changeset 1905 for trunk/external

Timestamp:

08/26/10 18:15:26 (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: do make

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Support Mac OS X.
Link libpython2.5.

File:

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

trunk/external/libpyrap/Makefile

@@ -17 +17 @@
 CASAARCH := $(word 2, $(CASAPATH))
 
-TARGET := libpyrap.so
-TESTMOD := $(TESTDIR)/_tConvert.so
+ifeq ($(shell uname), Darwin)
+   TARGET := libpyrap.dylib
+   TESTMOD := $(TESTDIR)/_tConvert.so
+else
+   TARGET := libpyrap.so
+   TESTMOD := $(TESTDIR)/_tConvert.so
+endif
 INSTDIR := $(CASAROOT)/$(CASAARCH)/lib
 
@@ -36 +41 @@
 PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
 PYTHONINCD := $(PYTHONROOT)/include/python2.5
+PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
+PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
 
 # 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
-NUMPYLIBD := $(NUMPYROOT)/core
-NUMPYLIB := $(NUMPYLIBD)/multiarray.so
 
 # the compiler
@@ -53 +57 @@
 
 # compiler flags
-CXXFLAGS := -fPIC -O3 -g
-CXXFLAGS += -ansi -Wno-long-long -Wall
-CXXOPTS := -DAIPS_64B -DAIPS_USENUMPY
+#CXXFLAGS := -fPIC -O3 -g
+#CXXFLAGS += -ansi -Wno-long-long -Wall
+CXXFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CXXFLAGS eval_vars) && echo $$CXXFLAGS)
+CXXFLAGS += -fPIC -O3
+CXXOPTS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COPTFLAGS eval_vars) && echo $$COPTFLAGS)
+CXXOPTS += -DAIPS_USENUMPY
 
 # links to external libraries
-LIBS := $(CORELIB) $(BOOSTLIB) $(NUMPYLIB)
+LIBS := $(CORELIB) $(BOOSTLIB) $(PYTHONLIB)
 
 # include directories
@@ -108 +115 @@
 test:
         $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $(TESTOBJ) $(TESTSRC)
-        $(LD) $(LDFLAGS) -o $(TESTMOD) $(TESTOBJ) $(LIBS) -L$(INSTDIR) -lpyrap
+        $(LD) $(LDFLAGS) -o $(TESTMOD) $(TESTOBJ) $(LIBS) -L$(EXTDIR) -lpyrap