Changeset 1608 for branches


Ignore:
Timestamp:
07/25/09 06:38:47 (15 years ago)
Author:
TakTsutsumi
Message:

New Development: No

JIRA Issue: No

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: update from locally reverted Makefile

by Darrell


File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/alma/src/Makefile

    r1603 r1608  
    1212CASAROOT  := $(word 1, $(CASAPATH))
    1313CASAARCH  := $(word 2, $(CASAPATH))
    14 CASAINC   := -I$(CASAROOT)/code/include -I$(CASAROOT)/$(CASAARCH)/include/casacore -I$(CASAROOT)/$(CASAARCH)/include
     14
     15COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
     16CORELIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CORELIB eval_vars) && echo $$CORELIB)
     17WCSLIBLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=WCSLIBLIBD eval_vars) && echo $$WCSLIBLIBD)
     18WCSLIBLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=WCSLIBLIB eval_vars) && echo $$WCSLIBLIB)
     19PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
     20PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
     21PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
     22BOOSTROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=BOOSTROOT eval_vars) && echo $$BOOSTROOT)
     23
     24CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
    1525CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
    16 
     26USELIB := lib
    1727
    1828# the compiler
     
    2434CXXFLAGS := -fPIC -O3 -g
    2535CXXFLAGS += -ansi -Wno-long-long -Wall
    26 #CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
    2736
    2837# darwin specific flags
     
    3544CFITSIOROOT := /usr
    3645CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
    37 #CFITSIOLIB := -L$(CFITSIOROOT)/lib -lcfitsio
    3846CFITSIOLIB := -lcfitsio
    3947
    4048#rpfits
    4149RPFITSROOT := /usr
    42 #RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
    4350RPFITSLIB := -lrpfits
    4451
    45 #wcs
    46 WCSLIB := -lwcs
    47 
    4852G2CROOT := /usr
    49 #G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
    50 #G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
    51 G2CARCH := $(G2CROOT)/lib/gcc/i386-redhat-linux/4.1.2/libgcc.a
    52 #G2CLIB := $(G2CROOT)/lib/libgfortran.a
    53 G2CLIB := $(G2CARCH)
    54 #G2CLIB := -lg2c
     53G2CLIB := -lgfortran
    5554
    5655# This assumes all casa libs are static only (*.a)
    5756# if not than there might by symbol resolution errors.
    58 CASAPPLIB := -L$(CASALIB) \
    59              -latnf -lcasa_images -lcasa_ms -lcasa_components -lcasa_coordinates \
    60              -lcasa_lattices -lcasa_fits -lcasa_measures -lcasa_measures_f \
    61              -lcasa_tables -lcasa_scimath -lcasa_scimath_f -lcasa_casa  \
    62              $(WCSLIB)  \
     57CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
     58             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
    6359             $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
    6460
     
    7167
    7268# python
    73 PYVERSION := 2.5
    74 PYTHONROOT := /usr/lib/casapy
    75 PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
    76 PYTHONLIB := -L$(PYTHONROOT)/lib -lpython$(PYVERSION)
     69PYTHONINC := $(addprefix -I,$(PYTHONINCD))
     70PYTHONLIB := -L$(PYTHONLIBD) $(PYTHONLIB)
    7771
    7872# use python universal build
     
    8882
    8983# has to be build with same g++ version as casa
    90 #BOOSTROOT := /home/casa/boost
    91 BOOSTROOT := /usr/lib/casapy
    92 #BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python-gcc34
    9384BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
    94 #BOOSTINC  := -I$(BOOSTROOT)/include/boost-1_35
    95 BOOSTINC  := -I$(BOOSTROOT)/include/boost
     85BOOSTINC  := -I$(BOOSTROOT)/include/boost -I$(BOOSTROOT)/include
    9686
    9787LDFLAGS   := -shared -Wl$(TARGET) -s -Xlinker -rpath -Xlinker $(BOOSTROOT)/lib:$(PYTHONROOT)/lib:$(CASALIB)
Note: See TracChangeset for help on using the changeset viewer.