Changeset 1198 for trunk/src/Makefile

Timestamp:

08/29/06 10:26:13 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

File:

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

trunk/src/Makefile

@@ -1 @@
-TARGET   := /tmp/_asap.so
+TARGET   := _asap.so
 
 # the casa environment AIPSPATH has to be defined
@@ -15 +15 @@
 # compiler flags
 CXXFLAGS := -fPIC -O3
-CXXFLAGS += -ansi -pedantic -Wno-long-long -Wall
+CXXFLAGS += -ansi -Wno-long-long -Wall
 CXXOPTS := -DAIPS_NO_TEMPLATE_SRC
 
 # darwin specific flags
 ifeq "$(CASAARCH)" "darwin"
-   CXXFLAGS := -O2 -DAIPS_DARWIN
-   CXXFLAGS += -ansi -pedantic -Wno-long-long -Wno-long-double
-endif
-
+   CXXFLAGS +=-DAIPS_DARWIN
+   CXXFLAGS += -Wno-long-double
+endif
 
 # cfitsio
-CFITSIOROOT := /usr/local
-# If aips++ is build with LFS you need to have
+CFITSIOROOT := /usr
+# If aips++ is build with LFS (default) you need to have
 # libcfitsio with lfs support
+# this is default in cfitsio >= 3.0
 CFITSIOINC := -I$(CFITSIOROOT)/include
-CFITSIOLIB := $(CFITSIOROOT)/lib/libcfitsio_lfs.a
-#CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
+CFITSIOLIB := -L$(CFITSIOROOT) -lcfitsio
 
 #rpfits
 RPFITSROOT := /usr/local
 RPFITSLIB := $(RPFITSROOT)/lib/librpfits.a
+
+G2CROOT := /usr
+G2CLIB := $(G2CROOT)/lib -lg2c
 
 # This assumes all casa libs are static only (*.a)
@@ -45 +47 @@
              -ltables -lscimath -lscimath_f -lcasa  \
              $(CASALIB)/libwcs.a \
-             $(RPFITSLIB) $(CFITSIOLIB) -lg2c -lstdc++
+             $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
 
 # darwin specific CASA flags
@@ -59 +61 @@
 LDFLAGS   := -shared -Wl$(TARGET) -s
 ifeq "$(CASAARCH)" "darwin"
-   LDFLAGS   := -dynamiclib -single_module
-endif
-
-# python only 2.3 has been tested
+   LDFLAGS   := -bundle
+endif
+
+# python
 PYVERSION := 2.3
 PYTHONROOT := /usr
@@ -68 +70 @@
 PYTHONLIB := -L$(PYTHONROOT)/lib -lpython$(PYVERSION)
 
+# use python universal build
+ifeq "$(CASAARCH)" "darwin"
+   PYVERSION := 2.4
+   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
+   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
+   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
+endif
+
 # has to be build with same g++ version as casa
 BOOSTROOT := /usr
@@ -79 +89 @@
 
 CCOBJECTS := MathUtils.o \
-             MathUtils2.o \
+             MathUtils2.o \
              RowAccumulator.o \
              Logger.o \