Changeset 82 for trunk


Ignore:
Timestamp:
09/07/04 11:19:07 (20 years ago)
Author:
mar637
Message:

a) Move to CASA form AIPS.
b) stricter error checking

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile

    r77 r82  
    33CXX      := g++-3.2.3
    44CXXFLAGS := -O -fPIC
    5 CXXFLAGS += -fpermissive # This should be removed.
     5#CXXFLAGS += -fpermissive # This should be removed.
    66#CXXFLAGS += -ansi
    7 #CXXFLAGS += -pedantic -Wno-long-long
     7CXXFLAGS += -pedantic -Wno-long-long
    88#CXXFLAGS += -Wall -Wno-parentheses
    99
    … …  
    1111CFITSIOINC := -I/usr/local/include/cfitsio
    1212
    13 AIPSROOT  := $(word 1, $(AIPSPATH))
    14 AIPSINC   := -I$(AIPSROOT)/code/include
    15 AIPSLIB   := $(AIPSROOT)/linux_gnu/lib
    16 AIPSPPLIB := $(AIPSLIB)/version.o \
    17              -L$(AIPSLIB) -latnf -ltrial -laips -laips_f \
    18              $(AIPSLIB)/libwcs.a \
     13CASAROOT  := $(word 1, $(AIPSPATH))
     14CASAINC   := -I$(CASAROOT)/code/include
     15CASALIB   := $(CASAROOT)/linux_gnu/lib
     16CASAPPLIB := $(CASALIB)/version.o \
     17             -L$(CASALIB) \
     18             -latnf -lms -limages -lcomponents -lcoordinates \
     19             -llattices -lfits -lmeasures -lmeasures_f \
     20             -ltables -lscimath -lscimath_f -lcasa \
     21              $(CASALIB)/libwcs.a -lmir \
    1922             -lrpfits $(CFITSIOLIB) -llapack -lblas -lg2c
    2023
    … …  
    2932PYTHONLIB := -lpython2.3
    3033
    31 INCDIRS   := -I. $(AIPSINC) $(BOOSTINC) $(PYTHONINC) $(CFITSIOINC)
    32 LIBS      := $(BOOSTLIB) $(PYTHONLIB) $(AIPSPPLIB)
     34INCDIRS   := -I. $(CASAINC) $(BOOSTINC) $(PYTHONINC) $(CFITSIOINC)
     35LIBS      := $(BOOSTLIB) $(PYTHONLIB) $(CASAPPLIB)
    3336
    3437OBJECTS   := MathUtils.o \
Note: See TracChangeset for help on using the changeset viewer.