Changeset 2602 for trunk/psLib/src/astronomy

Timestamp:

Dec 3, 2004, 9:43:43 AM (22 years ago)

Author:

gusciora

Message:

MOdified makefile for /usr/local/include

Location:

trunk/psLib/src/astronomy

Files:

• Makefile (modified) (1 diff)
• psCoord.c (modified) (2 diffs)

trunk/psLib/src/astronomy/Makefile

@@ -3 +3 @@
 endif
 
+# XXX: Must put appropiate conditional here:
+LIBXMLDIR = /usr/include/libxml2
+LIBXMLDIR = /usr/local/include/libxml2
+
 TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
 CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \
-    -I.. -I../image -I../fileUtils -I/usr/local/include/libxml2 \
+    -I.. -I../image -I../fileUtils -I$(LIBXMLDIR) \
     -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\""
 

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-02 21:12:51 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-03 19:43:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -208 +208 @@
     y = coord->d;
     dx = x - transform->phiP;
-    sinY = cos(y) * sin(dx) * transform->sinDeltaP + sin(y) * transform->cosDeltaP;
+    sinY = cos(y) * sin(dx) * transform->sinDeltaP +
+           sin(y) * transform->cosDeltaP;
     cosY = sqrt(1.0 - sinY * sinY);
-    sinX = (cos(y) * sin(dx) * transform->cosDeltaP - sin(y) * transform->sinDeltaP) / cos(y);
+    sinX = (cos(y) * sin(dx) * transform->cosDeltaP -
+            sin(y) * transform->sinDeltaP) / cos(y);
     cosX = cos(y) * cos(dx) / cos(y);