Changeset 1915 for trunk/external

Timestamp:

08/30/10 15:13:13 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (related to merge)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: make & make install

Put in Release Notes: No

Module(s): asap

Description: merged Wes's changes to Makefiles

File:

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

trunk/external/libpyrap/Makefile

@@ -19 +19 @@
 ifeq ($(shell uname), Darwin)
    TARGET := libpyrap.dylib
-   TESTMOD := $(TESTDIR)/_tConvert.dylib
+   TESTMOD := $(TESTDIR)/_tConvert.so
 else
    TARGET := libpyrap.so
@@ -40 +40 @@
 # python
 PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
-PYTHONINCD := $(PYTHONROOT)/include/python2.5
+PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
 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)
-NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
-NUMPYINCD := $(NUMPYROOT)/core/include
+#NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
+#NUMPYINCD := $(NUMPYROOT)/core/include
 
 # the compiler
@@ -68 +68 @@
 
 # include directories
-INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) -I$(NUMPYINCD) \
-           -I$(PYRAPROOT) -I$(PYTHONINCD)
+INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) \
+           -I$(PYRAPROOT) $(addprefix -I, $(PYTHONINCD))
 
 # link option
-LDFLAGS := -shared 
+LDFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=LD_FLAGS eval_vars) && echo $$LD_FLAGS)
+LDFLAGS += -shared 
 
 OBJECTS := $(PYRAPDIR)/PycArray.o \