Changeset 1879

Timestamp:

08/19/10 14:40:16 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

Test Programs: make & make install

Put in Release Notes: No

Module(s): none

Description: Modified Makefile-s so that libatnf.so is installed at the time of "make install" instead of "make"

Location:

trunk

Files:

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

trunk/Makefile

@@ -46 +46 @@
         @if ( test ! -d $(PREFIX)/share/asap ) ; then mkdir -p $(PREFIX)/share/asap ; fi
         @cp -f share/ipythonrc-asap $(PREFIX)/share/asap/
+        @cd $(ASAPROOT)/$(ATNFD); make install
         @echo "Successfully installed asap module to" $(PYDIR)
 

trunk/external-alma/Makefile

@@ -131 +131 @@
 .PHONY : all clean objects realclean install
 
-all : $(TARGETLIB) install
+all : $(TARGETLIB)
 
 objects : $(OBJECTS)

trunk/src/Makefile

@@ -42 +42 @@
 CXXFLAGS := -fPIC -O3 -g
 CXXFLAGS += -ansi -Wno-long-long -Wall
-#CXXOPTS := -DAIPS_64B
+CXXOPTS := -DAIPS_64B
 
 # darwin specific flags
@@ -63 +63 @@
 G2CLIB := -lgfortran
 
-# This assumes all casa libs are static only (*.a)
-# if not than there might by symbol resolution errors.
-CASAPPLIB := -L$(CASALIB) -latnf $(CORELIB) \
+# links to external libraries
+CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) \
              -L$(WCSLIBLIBD) $(WCSLIBLIB) \
              -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
@@ -79 +78 @@
 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