Changeset 1917

Timestamp:

09/01/10 12:20:06 (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: build asap

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Updates from Wes and Darrell.

File:

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

trunk/external/libpyrap/Makefile

@@ -27 +27 @@
 
 # CASACORE 
-#COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
-COREINCD := $(CASAROOT)/$(CASAARCH)/include/casacore
+COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
 CORELIBD := $(CASAROOT)/$(CASAARCH)/lib
-CORELIB := -L$(CORELIBD) -lcasa_casa
+CORELIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CORELIB eval_vars) && echo $$CORELIB)
 
 # boost 
@@ -74 +73 @@
 LDFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=LD_FLAGS eval_vars) && echo $$LD_FLAGS)
 LDFLAGS += -shared 
+ifeq ($(shell uname), Darwin)
+   LDFLAGS += -headerpad_max_install_names -install_name $(CASAROOT)/$(CASAARCH)/lib/$(TARGET)
+endif
 
 OBJECTS := $(PYRAPDIR)/PycArray.o \