Changeset 1762 for branches/alma

Timestamp:

07/07/10 09:47:32 (14 years ago)

Author:

TakTsutsumi

Message:

New Development: No

JIRA Issue: No/Yes List JIRA ticket.

Ready for Test: Yes

Interface Changes: Yes/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: Adjusted Makefile to compile on MacOSX

File:

• branches/alma/src/Makefile (modified) (4 diffs)

branches/alma/src/Makefile

@@ -17 +17 @@
 WCSLIBLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=WCSLIBLIBD eval_vars) && echo $$WCSLIBLIBD)
 WCSLIBLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=WCSLIBLIB eval_vars) && echo $$WCSLIBLIB)
+PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
 PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
 PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
 PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
+#PYTHONVER := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONVER eval_vars) && echo $$PYTHONVER)
 BOOSTROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=BOOSTROOT eval_vars) && echo $$BOOSTROOT)
+RPFITSLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=RPFITSLIBD eval_vars) && echo $$RPFITSLIBD)
 
 CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
-USELIB := lib64
+#USELIB := lib64
+USELIB := lib
 
 # the compiler
@@ -34 +38 @@
 CXXFLAGS := -fPIC -O3 -g
 CXXFLAGS += -ansi -Wno-long-long -Wall
-CXXOPTS := -DAIPS_64B
+#CXXOPTS := -DAIPS_64B
 
 # darwin specific flags
 ifeq "$(CASAARCH)" "darwin"
+   #CXXFLAGS +=-DAIPS_DARWIN -arch i386 #For 10.6
    CXXFLAGS +=-DAIPS_DARWIN
-   CXXFLAGS += -Wno-long-double
+   #CXXFLAGS += -Wno-long-double
 endif
 
@@ -58 +63 @@
 CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
              -L$(WCSLIBLIBD) $(WCSLIBLIB) \
-             $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
+             -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
 
 # darwin specific CASA flags
@@ -72 +77 @@
 
 # use python universal build
-ifeq "$(CASAARCH)" "darwin"
-   PYVERSION := 2.5
-   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
-   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
-   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
-endif
+#ifeq "$(CASAARCH)" "darwin"
+#   PYVERSION := 2.5
+#   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
+#   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
+#   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
+#endif
 
 # the linker