Changeset 1603 for branches/alma/src/Makefile

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

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

branches/alma/src/Makefile

@@ -43 +43 @@
 RPFITSLIB := -lrpfits
 
+#wcs
+WCSLIB := -lwcs
+
 G2CROOT := /usr
-G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
-G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
-G2CARCH := $(G2CROOT)/lib/gcc/i386-redhat-linux/4.1.0/libgcc.a
+#G2CARCH := $(G2CROOT)/lib/gcc/i386-apple-darwin8.7.1/4.2.0/libgcc.a
+#G2CARCH := $(G2CROOT)/lib/gcc/powerpc-apple-darwin8.7.0/4.2.0/libgcc.a
+G2CARCH := $(G2CROOT)/lib/gcc/i386-redhat-linux/4.1.2/libgcc.a
 #G2CLIB := $(G2CROOT)/lib/libgfortran.a
-G2CLIB := -lg2c
+G2CLIB := $(G2CARCH)
+#G2CLIB := -lg2c
 
 # This assumes all casa libs are static only (*.a)
@@ -56 +60 @@
              -lcasa_lattices -lcasa_fits -lcasa_measures -lcasa_measures_f \
              -lcasa_tables -lcasa_scimath -lcasa_scimath_f -lcasa_casa  \
-             $(CASALIB)/libwcs.a \
+             $(WCSLIB)  \
              $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
 
@@ -127 +131 @@
              STWriter.o \
              STAsciiWriter.o \
+             STFITSImageWriter.o \
              Scantable.o \
              Templates.o 
@@ -172 +177 @@
              STPolLinear.h \
              STWriter.h \
-             STAsciiWriter.h
+             STAsciiWriter.h \
+             STFITSImageWriter.h
 
 STATICCCLIB := libasap.a