Changes in trunk/src/Makefile [1915:1848]

File:

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

trunk/src/Makefile

@@ -7 +7 @@
 ###    3. Replase library names in G2CARCH '-lcasa_*' with '-l*'.
 ###    4. Comment-IN the definition of 'CXXOPTS'. 
-TARGET   := /tmp/_asap.so
-
-ifndef ASAPROOT
-        ASAPROOT := $(abspath ..)
-endif
-ATNFD := external-alma
+#TARGET   := /tmp/_asap.so
+TARGET   := /home/nakazato/tmp/_asap.so
 
 # the casa environment AIPSPATH has to be defined
 CASAROOT  := $(word 1, $(CASAPATH))
 CASAARCH  := $(word 2, $(CASAPATH))
-
-CXXFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CXXFLAGS eval_vars) && echo $$CXXFLAGS)
-CXXOPTS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COPTFLAGS eval_vars) && echo $$COPTFLAGS)
-LDFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=LD_FLAGS eval_vars) && echo $$LD_FLAGS)
 
 COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
@@ -30 +22 @@
 PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
 PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
+#PYTHONVER := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONVER eval_vars) && echo $$PYTHONVER)
 BOOSTROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=BOOSTROOT eval_vars) && echo $$BOOSTROOT)
 RPFITSLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=RPFITSLIBD eval_vars) && echo $$RPFITSLIBD)
-CFITSIOLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CFITSIOLIBD eval_vars) && echo $$CFITSIOLIBD)
-CFITSIOINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CFITSIOINCD eval_vars) && echo $$CFITSIOINCD)
 
 CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
+#USELIB := lib64
+USELIB := lib
 
 # the compiler
@@ -44 +37 @@
 
 # compiler flags
-CXXFLAGS += -fPIC -DHAVE_LIBPYRAP
-
-PYRAPD := $(ASAPROOT)/external/libpyrap
-PYRAPLIBD := $(PYRAPD)
-PYRAPINCD := $(PYRAPD)/pyrap-0.3.2
-PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
-
-
+CXXFLAGS := -fPIC -O3 -g
+CXXFLAGS += -ansi -Wno-long-long -Wall
+#CXXOPTS := -DAIPS_64B
+
+# darwin specific flags
+ifeq "$(CASAARCH)" "darwin"
+   #CXXFLAGS +=-DAIPS_DARWIN -arch i386 #For 10.6
+   CXXFLAGS +=-DAIPS_DARWIN
+   #CXXFLAGS += -Wno-long-double
+endif
+
+# cfitsio
+CFITSIOROOT := /usr
+CFITSIOINC := -I$(CFITSIOROOT)/include/cfitsio
 CFITSIOLIB := -lcfitsio
 
 #rpfits
+RPFITSROOT := /usr
 RPFITSLIB := -lrpfits
 
@@ -60 +60 @@
 G2CLIB := -lgfortran
 
-# links to external libraries
-CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB)\
+# This assumes all casa libs are static only (*.a)
+# if not than there might by symbol resolution errors.
+CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
              -L$(WCSLIBLIBD) $(WCSLIBLIB) \
              -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
 
 # darwin specific CASA flags
-ifeq ($(shell uname), Darwin)
+ifeq "$(CASAARCH)" "darwin"
    CASAPPLIB += -framework vecLib
 else
@@ -72 +73 @@
 endif
 
+# python
+PYTHONINC := $(addprefix -I,$(PYTHONINCD))
+PYTHONLIB := -L$(PYTHONLIBD) $(PYTHONLIB)
+
+# use python universal build
+#ifeq "$(CASAARCH)" "darwin"
+#   PYVERSION := 2.5
+#   PYTHONROOT := /Library/Frameworks/Python.framework/Versions/$(PYVERSION)
+#   PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
+#   PYTHONLIB := -L$(PYTHONROOT)/lib -framework Python
+#endif
+
+# the linker
 LD        := $(CXX)
 
@@ -78 +92 @@
 BOOSTINC  := -I$(BOOSTROOT)/include/boost -I$(BOOSTROOT)/include
 
-LDFLAGS   += -shared
+LDFLAGS   := -shared -Wl$(TARGET) -s -Xlinker -rpath -Xlinker $(BOOSTROOT)/lib:$(PYTHONROOT)/lib:$(CASALIB)
+ifeq "$(CASAARCH)" "darwin"
+   LDFLAGS   := -bundle
+endif
 
 
 # DO NOT MODIFY AFTER THIS
-INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) $(addprefix -I, $(PYTHONINCD)) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
+INCDIRS   := -I. $(CASAINC)  $(CFITSIOINC) $(BOOSTINC) $(PYTHONINC)
 LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)