Changeset 1259 for trunk/src/Makefile

Timestamp:

09/11/06 15:10:05 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

File:

• trunk/src/Makefile (modified) (5 diffs)

trunk/src/Makefile

@@ -25 +25 @@
 
 # cfitsio
-CFITSIOROOT := /usr
-# If aips++ is build with LFS (default) you need to have
-# libcfitsio with lfs support
-# this is default in cfitsio >= 3.0
+CFITSIOROOT := /usr/local
 CFITSIOINC := -I$(CFITSIOROOT)/include
-CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
+CFITSIOLIB := -L$(CFITSIOROOT)/lib -lcfitsio
 
 #rpfits
@@ -36 +33 @@
 RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
 
-G2CROOT := /usr
-G2CLIB := $(G2CROOT)/lib -lg2c
+G2CROOT := /usr/local
+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
+G2CLIB := $(G2CROOT)/lib/libgfortran.a $(G2CARCH)
 
 # This assumes all casa libs are static only (*.a)
@@ -79 +78 @@
 
 # has to be build with same g++ version as casa
-BOOSTROOT := /usr
+BOOSTROOT := /usr/local
 BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python
 BOOSTINC  := -I$(BOOSTROOT)/include/boost
@@ -92 +91 @@
              RowAccumulator.o \
              Logger.o \
+             LineCatalog.o \
              STAttr.o \
              STHeader.o \
@@ -124 +124 @@
              python_STFitEntry.o \
              python_STWriter.o \
+             python_LineCatalog.o \
              python_asap.o