Changeset 1700 for branches/alma/src/Makefile

Timestamp:

02/16/10 16:21:26 (15 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1800 + CAS-1807)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: added parameters fitfunc for sdfit and clip, clipmaxmin, clipoutside for sdflag

Test Programs:

Put in Release Notes: No

Module(s): sdfit, sdflag

Description: Added a parameter for enabling Lorentzian line fitting with sdfit, and parameters for y-axis clipping with sdflag. Also 4 files for Lorentzian function class are (Lorentzian1D*) added.

File:

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

branches/alma/src/Makefile

@@ -24 +24 @@
 CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
-USELIB := lib
+USELIB := lib64
 
 # the compiler
@@ -34 +34 @@
 CXXFLAGS := -fPIC -O3 -g
 CXXFLAGS += -ansi -Wno-long-long -Wall
+CXXOPTS := -DAIPS_64B
 
 # darwin specific flags
@@ -56 +57 @@
 # if not than there might by symbol resolution errors.
 CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
-             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
+                /usr/lib64/libwcs.so \
              $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
+#             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
 
 # darwin specific CASA flags
@@ -140 +142 @@
 
 HEADERS   := MathUtils.h \
+             Lorentzian1D.h \
+             Lorentzian1DParam.h \
              Logger.h \
              STAttr.h \