Changeset 1877

Timestamp:

08/18/10 14:05:57 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): libatnf

Description:

Added make file in external-alma so that libatnf will be built from the codes there.

Location:

trunk

Files:

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

trunk/Makefile

@@ -12 +12 @@
    ASAPROOT := $(shell pwd)
 endif
+ATNFD := external-alma
 
 #PY := $(wildcard python/*.py)
@@ -27 +28 @@
 module:
         @if ( test -f getsvnrev.sh ) ; then /bin/bash getsvnrev.sh ; fi
+        @cd $(ASAPROOT)/$(ATNFD); make
         @cd $(ASAPROOT)/src; make
         @cd $(ASAPROOT)/apps; make
@@ -49 +51 @@
         @cd $(ASAPROOT)/src; make clean
         @cd $(ASAPROOT)/doc; make clean
+        @cd $(ASAPROOT)/$(ATNFD); make realclean
 
 datadist:

trunk/src/Makefile

@@ -8 +8 @@
 ###    4. Comment-IN the definition of 'CXXOPTS'. 
 TARGET   := /tmp/_asap.so
+
+ifndef ASAPROOT
+        ASAPROOT := $(abspath ..)
+endif
+ATNFD := external-alma
 
 # the casa environment AIPSPATH has to be defined
@@ -27 +32 @@
 CASAINC   := -I$(CASAROOT)/code/include -I$(COREINCD) -I$(CASAROOT)/$(CASAARCH)/include
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
-#USELIB := lib64
-USELIB := lib
+USELIB := lib64
 
 # the compiler
@@ -98 +102 @@
 
 # DO NOT MODIFY AFTER THIS
-INCDIRS   := -I. $(CASAINC)  $(CFITSIOINC) $(BOOSTINC) $(PYTHONINC)
+INCDIRS   := -I. $(CASAINC)  $(CFITSIOINC) $(BOOSTINC) $(PYTHONINC) -I$(ASAPROOT)/$(ATNFD)
 LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)