Changeset 1915

Timestamp:

08/30/10 15:13:13 (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: make & make install

Put in Release Notes: No

Module(s): asap

Description: merged Wes's changes to Makefiles

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• apps/Makefile (modified) (2 diffs)
• external-alma/Makefile (modified) (2 diffs)
• external/libpyrap/Makefile (modified) (3 diffs)
• src/Makefile (modified) (3 diffs)

trunk/Makefile

@@ -43 +43 @@
         @if ( test ! -d $(PYDIR)/asap ) ; then mkdir -p $(PYDIR)/asap ; fi
         @if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+        @cd $(ASAPROOT)/$(ATNFD); make install
+        @cd $(ASAPROOT)/$(PYRAPD); make install
         @for file in $(LIBS) ; do cp -f $$file $(PYDIR)/asap ; done
         @for file in $(BINS) ; do cp -f $$file $(PREFIX)/bin ; done
         @for file in $(PY) ; do cp -f $$file $(PYDIR)/asap ; done
-        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
         @if ( test ! -d $(PREFIX)/share/asap ) ; then mkdir -p $(PREFIX)/share/asap ; fi
         @cp -f share/ipythonrc-asap $(PREFIX)/share/asap/
-        @cd $(ASAPROOT)/$(PYRAPD); make install
-        @cd $(ASAPROOT)/$(ATNFD); make install
+        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
         @echo "Successfully installed asap module to" $(PYDIR)
 

trunk/apps/Makefile

@@ -8 +8 @@
 CASAARCH  := $(word 2, $(CASAPATH))
 
+CORELIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CORELIB eval_vars) && echo $$CORELIB)
 COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
@@ -17 +18 @@
 
 # compiler flags
-CXXFLAGS := -fPIC -O3 -g
-CXXFLAGS += -ansi -Wno-long-long -Wall
-CXXFLAGS := -Xlinker -rpath -Xlinker $(CASALIB)
+CXXFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CXXFLAGS eval_vars) && echo $$CXXFLAGS)
+CXXFLAGS += -fPIC -O3 -Xlinker -rpath -Xlinker $(CASALIB)
 
 
 INCDIRS   := -I$(COREINCD)
-LIBS      := -L$(CASALIB) -lcasa_tables -lcasa_casa
+LIBS      := -L$(CASALIB) $(CORELIB)
 
 OBJECTS := asap2to3 

trunk/external-alma/Makefile

@@ -40 +40 @@
 CXXFLAGS += -fPIC
 
-# casacore library dependencies
-CORELIBS := -lcasa_casa -lcasa_measures -lcasa_scimath -lcasa_ms -lcasa_tables
-
 # cfitsio
 CFITSIOLIB := -lcfitsio
@@ -58 +55 @@
 
 INCDIRS   := -I$(COREINCD) -I$(CFITSIOINCD) -I$(EXTDIR)
-LIBS      := -L$(CFITSIOLIBD) $(CFITSIOLIB) -L$(RPFITSLIBD) $(RPFITSLIB) -L$(CASALIB) $(CORELIBS) -lgfortran
+LIBS      := -L$(CFITSIOLIBD) $(CFITSIOLIB) -L$(RPFITSLIBD) $(RPFITSLIB) -L$(CASALIB) $(CORELIB) -lgfortran
 
 OBJECTS := $(ATNFDIR)/pks/pks_maths.o \

trunk/external/libpyrap/Makefile

@@ -19 +19 @@
 ifeq ($(shell uname), Darwin)
    TARGET := libpyrap.dylib
-   TESTMOD := $(TESTDIR)/_tConvert.dylib
+   TESTMOD := $(TESTDIR)/_tConvert.so
 else
    TARGET := libpyrap.so
@@ -40 +40 @@
 # python
 PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
-PYTHONINCD := $(PYTHONROOT)/include/python2.5
+PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
 PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
 PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
 
 # numpy (use numpy in CASA)
-NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
-NUMPYINCD := $(NUMPYROOT)/core/include
+#NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
+#NUMPYINCD := $(NUMPYROOT)/core/include
 
 # the compiler
@@ -68 +68 @@
 
 # include directories
-INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) -I$(NUMPYINCD) \
-           -I$(PYRAPROOT) -I$(PYTHONINCD)
+INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) \
+           -I$(PYRAPROOT) $(addprefix -I, $(PYTHONINCD))
 
 # link option
-LDFLAGS := -shared 
+LDFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=LD_FLAGS eval_vars) && echo $$LD_FLAGS)
+LDFLAGS += -shared 
 
 OBJECTS := $(PYRAPDIR)/PycArray.o \

trunk/src/Makefile

@@ -44 +44 @@
 
 # compiler flags
-CXXFLAGS += -fPIC
-CXXOPTS += -DHAVE_LIBPYRAP
-
-CFITSIOLIB := -lcfitsio
-
-#rpfits
-RPFITSLIB := -lrpfits
-
-G2CROOT := /usr
-G2CLIB := -lgfortran
-
-# pyrap
+CXXFLAGS += -fPIC -DHAVE_LIBPYRAP
+
 PYRAPD := $(ASAPROOT)/external/libpyrap
 PYRAPLIBD := $(PYRAPD)
@@ -61 +51 @@
 PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
 
+
+CFITSIOLIB := -lcfitsio
+
+#rpfits
+RPFITSLIB := -lrpfits
+
+G2CROOT := /usr
+G2CLIB := -lgfortran
+
 # links to external libraries
-CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB) \
+CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB)\
              -L$(WCSLIBLIBD) $(WCSLIBLIB) \
              -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
@@ -83 +82 @@
 
 # DO NOT MODIFY AFTER THIS
-INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
+INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) $(addprefix -I, $(PYTHONINCD)) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
 LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)