Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/external/libpyrap/Makefile

    r1911 r1915  
    1919ifeq ($(shell uname), Darwin)
    2020   TARGET := libpyrap.dylib
    21    TESTMOD := $(TESTDIR)/_tConvert.dylib
     21   TESTMOD := $(TESTDIR)/_tConvert.so
    2222else
    2323   TARGET := libpyrap.so
     
    4040# python
    4141PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
    42 PYTHONINCD := $(PYTHONROOT)/include/python2.5
     42PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
    4343PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
    4444PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
    4545
    4646# numpy (use numpy in CASA)
    47 NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
    48 NUMPYINCD := $(NUMPYROOT)/core/include
     47#NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
     48#NUMPYINCD := $(NUMPYROOT)/core/include
    4949
    5050# the compiler
     
    6868
    6969# include directories
    70 INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) -I$(NUMPYINCD) \
    71            -I$(PYRAPROOT) -I$(PYTHONINCD)
     70INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) \
     71           -I$(PYRAPROOT) $(addprefix -I, $(PYTHONINCD))
    7272
    7373# link option
    74 LDFLAGS := -shared
     74LDFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=LD_FLAGS eval_vars) && echo $$LD_FLAGS)
     75LDFLAGS += -shared
    7576
    7677OBJECTS := $(PYRAPDIR)/PycArray.o \
Note: See TracChangeset for help on using the changeset viewer.