Changeset 684 for trunk


Ignore:
Timestamp:
09/22/05 12:06:19 (19 years ago)
Author:
mar637
Message:

reflect aips++ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r655 r684  
    1 TARGET   := _asap.so
     1TARGET   := /tmp/_asap.so
    22ifndef CXX
    33   CXX      := g++
     
    66CXXFLAGS += -ansi
    77CXXFLAGS += -pedantic -Wno-long-long
     8CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
    89
    910CFITSIOROOT := /usr/local If aips++ is build with LFS you need to have
    1011# libcfitsio with lfs support
    11 # CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a
    12 CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
    13 CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
     12CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a
     13#CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
     14#CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
     15
    1416
    1517CASAROOT  := $(word 1, $(AIPSPATH))
    1618CASAARCH  := $(word 2, $(AIPSPATH))
    17 CASAINC   := -I$(CASAROOT)/code/include
     19CASAINC   := -I$(CASAROOT)/code/include -I$(CASAROOT)/code/casa/wcslib
    1820CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
     21
     22
    1923# This assumes all casa libs are static only (*.a)
    2024# if not than there might by symbol resolution errors.
     
    2327             -latnf -limages -lms -lcomponents -lcoordinates \
    2428             -llattices -lfits -lmeasures -lmeasures_f \
    25              -ltables -lscimath -lscimath_f -lcasa -lwcs \
     29             -ltables -lscimath -lscimath_f -lcasa  \
     30             $(CASALIB)/libwcs.a \
    2631              -lrpfits $(CFITSIOLIB) -dy -llapack -lblas -lg2c
    2732
     
    3641
    3742BOOSTROOT := /usr
    38 BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python$(PYVERSION)
     43BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
    3944BOOSTINC  := -I$(BOOSTROOT)/include/boost
    4045
     
    97102.cpp.o:
    98103        -@ echo
    99            $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
     104           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
    100105
    101106.cc.o:
    102107        -@ echo
    103            $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
     108           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
    104109
    105110.cxx.o:
    106111        -@ echo
    107            $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
     112           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
    108113
    109114.C.o:
    110115        -@ echo
    111            $(CXX) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
     116           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
    112117
    113118
Note: See TracChangeset for help on using the changeset viewer.