Changeset 1894 for trunk/src

Timestamp:

08/24/10 16:11:34 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (related to merge)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: try make

Put in Release Notes: No

Module(s): asap

Description: merged Wes's developments in NRAO repository.

Library and include pathes and build options are copied from casa build.

File:

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

trunk/src/Makefile

@@ -18 +18 @@
 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)
 CORELIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CORELIB eval_vars) && echo $$CORELIB)
@@ -26 +30 @@
 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
 
 # the compiler
@@ -40 +44 @@
 
 # compiler flags
-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
+CXXFLAGS += -fPIC
+
 CFITSIOLIB := -lcfitsio
 
 #rpfits
-RPFITSROOT := /usr
 RPFITSLIB := -lrpfits
 
@@ -69 +60 @@
 
 # darwin specific CASA flags
-ifeq "$(CASAARCH)" "darwin"
+ifneq (,$(findstring $(CASAARCH)", "darwin"))
    CASAPPLIB += -framework vecLib
 else
@@ -75 +66 @@
 endif
 
-# python
-PYTHONINC := $(addprefix -I,$(PYTHONINCD))
-PYTHONLIB := -L$(PYTHONLIBD) $(PYTHONLIB)
-
-# the linker
 LD        := $(CXX)
 
@@ -86 +72 @@
 BOOSTINC  := -I$(BOOSTROOT)/include/boost -I$(BOOSTROOT)/include
 
-LDFLAGS   := -shared -Wl$(TARGET) -s -Xlinker -rpath -Xlinker $(BOOSTROOT)/lib:$(PYTHONROOT)/lib:$(CASALIB)
-ifeq "$(CASAARCH)" "darwin"
-   LDFLAGS   := -bundle
-endif
+LDFLAGS   += -shared
 
 
 # DO NOT MODIFY AFTER THIS
-INCDIRS   := -I. $(CASAINC)  $(CFITSIOINC) $(BOOSTINC) $(PYTHONINC) -I$(ASAPROOT)/$(ATNFD)
+INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD)
 LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)