Changeset 635 for trunk/src

Timestamp:

05/11/05 10:00:33 (20 years ago)

Author:

mar637

Message:

update to reflect /usr instead of /usr/local as default lib/incdir

File:

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

trunk/src/Makefile

@@ -1 @@
-TARGET   := ../lib/_asap.so
+TARGET   := _asap.so
+ifndef CXX
+   CXX      := g++
+endif
+CXXFLAGS := -O3 -fPIC
+CXXFLAGS += -ansi
+CXXFLAGS += -pedantic -Wno-long-long
 
-ifdef NARRABRI_ASAP
-CXX      := /usr/bin/g++
-else
-CXX      := g++-3.2.3
-endif
-
-CXXFLAGS := -O -fPIC
-
-#CXXFLAGS += -ansi
-CXXFLAGS += -pedantic -Wno-long-long
-#CXXFLAGS += -Wall -Wno-parentheses
-
-CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a #-lcfitsio
-CFITSIOINC := -I/usr/local/include/cfitsio
+CFITSIOROOT := /usr
+# If aips++ is build with LFS
+# CFITSIOLIB := /usr/local/lib/libcfitsio_lfs.a
+CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
+CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
 
 CASAROOT  := $(word 1, $(AIPSPATH))
@@ -24 +21 @@
              -llattices -lfits -lmeasures -lmeasures_f \
              -ltables -lscimath -lscimath_f -lcasa \
-              $(CASALIB)/libwcs.a -lmir \
+              $(CASALIB)/libwcs.a \
              -lrpfits $(CFITSIOLIB) -llapack -lblas -lg2c
 
-LD        := g++-3.2.3
+LD        := $(CXX)
 LDFLAGS   := -shared -Wl,--soname=$(TARGET)
 LDFLAGS   += -s
 
-BOOSTLIB  := /nfs/atapplic/boost/linux/lib/libboost_python2.3-gcc-mt.a
-BOOSTINC  := -I/usr/local/include/boost
+BOOSTROOT := /usr
+BOOSTLIB  := -L$(BOOSTROOT)/lib -lboost_python2.3
+BOOSTINC  := -I$(BOOSTROOT)/include/boost
 
-
-PYTHONINC := -I/usr/local/include/python2.3
-PYTHONLIB := -lpython2.3
+PYTHONROOT := /usr
+PYTHONINC := -I$(PYTHONROOT)/include/python2.3
+PYTHONLIB := -L$(PYTHONROOT)/lib -lpython2.3
 
 INCDIRS   := -I. $(CASAINC) $(BOOSTINC) $(PYTHONINC) $(CFITSIOINC)