Changeset 2603

Timestamp:

Dec 3, 2004, 12:23:04 PM (22 years ago)

Author:

desonia

Message:

changed the means in which xml2 lib/include files are located. Used xml2-config.

Location:

trunk/psLib/src

Files:

• Makefile.Globals (modified) (2 diffs)
• astronomy/Makefile (modified) (1 diff)

trunk/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.25 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-11-30 00:49:16 $
+##  $Revision: 1.26 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-12-03 22:23:04 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
 
 ifndef sladir
-        export sladir =  /usr/local/star
-endif   
+    export sladir = /usr/local/star
+endif
+
+ifndef xml2config
+    export xml2config = `which xml2-config`
+endif
+
+SLA_LINK := $(shell $(sladir)/bin/sla_link)
+XML2_LINK := $(shell $(xml2config) --libs)
+XML2_CFLAGS := $(shell $(xml2config) --cflags)
 
 # Set initial value for CFLAGS which will include all OS common flags for GCC
 GCOVFLAGS :=
-CFLAGS := -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -pipe $(GCOVFLAGS)
+CFLAGS := -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -pipe $(GCOVFLAGS) $(XML2_CFLAGS)
 
 ifdef NO_TRACE
 CFLAGS := $(CFLAGS) -DPS_NO_TRACE=1
 endif
- 
+
 # Set initial value for LDFLAGS which will include all OS common flags for GCC and required libraries.
 
-SLA_LINK := $(shell $(sladir)/bin/sla_link)
-EXTLIBS := -lxml2 -lcfitsio -lgsl -lgslcblas -lfftw3f -L$(sladir)/lib $(SLA_LINK) 
+EXTLIBS := -lxml2 -lcfitsio -lgsl -lgslcblas -lfftw3f -L$(sladir)/lib $(SLA_LINK) $(XML2_LINK)
 LDFLAGS := -g2 -pipe $(EXTLIBS) 
 

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$(LIBXMLDIR) \
+    -I.. -I../image -I../fileUtils \
     -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\""