Changeset 1951 for trunk/src

Timestamp:

11/11/10 20:27:27 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Updated Makefile such that libatnf.so and _asap.so depend on
casacore libraries so that those libraries are rebuilt if
casacore is updated.

File:

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

trunk/src/Makefile

@@ -46 +46 @@
 CXXFLAGS += -fPIC -DHAVE_LIBPYRAP
 
-PYRAPD := $(ASAPROOT)/external/libpyrap
-PYRAPLIBD := $(PYRAPD)
-PYRAPINCD := $(PYRAPD)/pyrap-0.3.2
+PYRAPD := external/libpyrap
+PYRAPLIBD := $(ASAPROOT)/$(PYRAPD)
+PYRAPINCD := $(ASAPROOT)/$(PYRAPD)/pyrap-0.3.2
 PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
 
@@ -181 +181 @@
              AsapLogSink.h
 
+
+# external libraries
+ifeq ($(shell uname), Darwin)
+        ATNF := $(ASAPROOT)/$(ATNFD)/libatnf.dylib
+        PYRAP := $(ASAPROOT)/$(PYRAPD)/libpyrap.dylib
+        CASACORELIB =   $(CASALIB)/libcasa_casa.dylib \
+                        $(CASALIB)/libcasa_components.dylib \
+                        $(CASALIB)/libcasa_coordinates.dylib \
+                        $(CASALIB)/libcasa_derivedmscal.dylib \
+                        $(CASALIB)/libcasa_fits.dylib \
+                        $(CASALIB)/libcasa_images.dylib \
+                        $(CASALIB)/libcasa_lattices.dylib \
+                        $(CASALIB)/libcasa_measures.dylib \
+                        $(CASALIB)/libcasa_mirlib.dylib \
+                        $(CASALIB)/libcasa_msfits.dylib \
+                        $(CASALIB)/libcasa_ms.dylib \
+                        $(CASALIB)/libcasa_scimath_f.dylib \
+                        $(CASALIB)/libcasa_scimath.dylib \
+                        $(CASALIB)/libcasa_tables.dylib
+else
+        ATNF := $(ASAPROOT)/$(ATNFD)/libatnf.so
+        PYRAP := $(ASAPROOT)/$(PYRAPD)/libpyrap.so
+        CASACORELIB =   $(CASALIB)/libcasa_casa.so \
+                        $(CASALIB)/libcasa_components.so \
+                        $(CASALIB)/libcasa_coordinates.so \
+                        $(CASALIB)/libcasa_derivedmscal.so \
+                        $(CASALIB)/libcasa_fits.so \
+                        $(CASALIB)/libcasa_images.so \
+                        $(CASALIB)/libcasa_lattices.so \
+                        $(CASALIB)/libcasa_measures.so \
+                        $(CASALIB)/libcasa_mirlib.so \
+                        $(CASALIB)/libcasa_msfits.so \
+                        $(CASALIB)/libcasa_ms.so \
+                        $(CASALIB)/libcasa_scimath_f.so \
+                        $(CASALIB)/libcasa_scimath.so \
+                        $(CASALIB)/libcasa_tables.so
+endif
+
 STATICCCLIB := libasap.a
 MEMBERS := $(patsubst %,$(STATICCCLIB)(%),$(CCOBJECTS))
@@ -209 +247 @@
 relink : cleanso $(TARGET)
 
-objects : $(OBJECTS)
+objects : $(OBJECTS) 
 
 $(TARGET) : $(OBJECTS)
@@ -215 +253 @@
           $(LD) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
 
-$(OBJECTS) : $(HEADERS)
+$(OBJECTS) : $(HEADERS) $(CASACORELIB) $(ATNF) $(PYRAP)
 
 staticlib: $(MEMBERS)