Changeset 1951 for trunk/external-alma

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/external-alma/Makefile (modified) (2 diffs)

trunk/external-alma/Makefile

@@ -109 +109 @@
 #       $(ATNFDIR)/PKSIO/PKSmsg.h
 
+ifeq ($(shell uname), Darwin)
+        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
+        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
+
 .SUFFIXES: .o .cc
 .cc.o:
@@ -124 +156 @@
           $(LD) $(CXXFLAGS) $(LDFLAGS) -o $(TARGETLIB) $(OBJECTS) $(LIBS)
 
-$(OBJECTS) : $(HEADERS)
+$(OBJECTS) : $(HEADERS) $(CASACORELIB)
 
 install :