Changeset 2869

Timestamp:

Jan 3, 2005, 1:41:36 PM (22 years ago)

Author:

harman

Message:

Added PS_LIB_VERSION

Location:

trunk/psLib/src

Files:

• Makefile.Globals (modified) (4 diffs)
• sysUtils/Makefile (modified) (2 diffs)

trunk/psLib/src/Makefile.Globals

@@ -6 +6 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.36 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-12-29 22:15:50 $
+##  $Revision: 1.37 $  $Name: not supported by cvs2svn $
+##  $Date: 2005-01-03 23:37:52 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
 endif
 
+ifndef PS_LIB_VERSION
+    export PS_LIB_VERSION = rel4
+endif
+
 ifndef sladir
     export sladir = /usr/local/star
@@ -70 +74 @@
 
 EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f -L$(sladir)/lib $(SLA_LINK) $(XML2_LINK)
-LDFLAGS := -g2 -pipe $(EXTLIBS) 
+LDFLAGS := -g2 -pipe $(EXTLIBS)
 
 # Define or refine variables for the Linux OS
@@ -86 +90 @@
 
 ifneq "$(findstring arwin,$(OSTYPE))" ""
-    CFLAGS += -Wno-long-double -DDARWIN 
+    CFLAGS += -Wno-long-double -DDARWIN
     CFLAGS_RELOC := $(CFLAGS)
     LDFLAGS := $(LDFLAGS) -lmx

trunk/psLib/src/sysUtils/Makefile

@@ -3 +3 @@
 ##  Makefile:   sysUtils
 ##
-##  $Revision: 1.23 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-11-10 18:25:40 $
+##  $Revision: 1.24 $  $Name: not supported by cvs2svn $
+##  $Date: 2005-01-03 23:41:36 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 # Set CFLAGS used by the implicit rule to compile .c
 
-CFLAGS := $(CFLAGS_RELOC) -I../collections -I../dataManip -I../sysUtils -I../include -I../astronomy -I../image -I..
+CFLAGS := $(CFLAGS_RELOC) -DPS_LIB_VERSION="\"$(PS_LIB_VERSION)\"" -I../collections -I../dataManip -I../sysUtils -I../include -I../astronomy -I../image -I..
 
 # Define the source objects