Changeset 1879 for trunk/src


Ignore:
Timestamp:
08/19/10 14:40:16 (14 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

Test Programs: make & make install

Put in Release Notes: No

Module(s): none

Description: Modified Makefile-s so that libatnf.so is installed at the time of "make install" instead of "make"


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r1877 r1879  
    4242CXXFLAGS := -fPIC -O3 -g
    4343CXXFLAGS += -ansi -Wno-long-long -Wall
    44 #CXXOPTS := -DAIPS_64B
     44CXXOPTS := -DAIPS_64B
    4545
    4646# darwin specific flags
     
    6363G2CLIB := -lgfortran
    6464
    65 # This assumes all casa libs are static only (*.a)
    66 # if not than there might by symbol resolution errors.
    67 CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
     65# links to external libraries
     66CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) \
    6867             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
    6968             -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
     
    7978PYTHONINC := $(addprefix -I,$(PYTHONINCD))
    8079PYTHONLIB := -L$(PYTHONLIBD) $(PYTHONLIB)
    81 
    82 # use python universal build
    83 #ifeq "$(CASAARCH)" "darwin"
    84 #   PYVERSION := 2.5
    85 #   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
    86 #   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
    87 #   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
    88 #endif
    8980
    9081# the linker
Note: See TracChangeset for help on using the changeset viewer.