Changeset 4816

Timestamp:

Aug 18, 2005, 12:20:10 PM (21 years ago)

Author:

drobbin

Message:

Edited makefiles to include ErrorText and libxml path for psModule

Location:

trunk/psLib

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• test/math/Makefile.am (modified) (2 diffs)
• test/xml/Makefile (modified) (4 diffs)

trunk/psLib/configure.ac

@@ -118 +118 @@
 ]],[[int v=MYSQL_VERSION_ID;
     if (v < 40102) {
-        exit(1);
+    exit(1);
     } else {
-        exit(0);
+    exit(0);
     }
 ]])], [], [AC_MSG_ERROR([MySQL 4.1.2 or newer is required.  Obtain it at  http://www.mysql.com or use --with-mysql to specify location.])])
@@ -192 +192 @@
 dnl LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
+PSLIB_CFLAGS="${PSLIB_CFLAGS=} `${XML_CONFIG} --cflags`"
 
 dnl ------------------- SWIG options ---------------------

trunk/psLib/src/Makefile.am

@@ -19 +19 @@
         psTest.h \
         pslib.h \
-        pslib_strict.h
+        pslib_strict.h \
+        psErrorText.h
 
 install-exec-hook: libpslib.la

trunk/psLib/test/math/Makefile.am

@@ -4 +4 @@
 
 TESTS = \
-        tst_psFunc00 \
-        tst_psFunc01 \
-        tst_psFunc02 \
-        tst_psFunc03 \
-        tst_psFunc04 \
-        tst_psFunc05 \
-        tst_psFunc07 \
-        tst_psFunc08 \
-        tst_psFunc09 \
-        tst_psFunc10 \
-        tst_psFunc11 \
-        tst_psHist00 \
-        tst_psHist01 \
-        tst_psHist02 \
-        tst_psHist03 \
-        tst_psMatrix01 \
-        tst_psMatrix02 \
-        tst_psMatrix03 \
-        tst_psMatrix04 \
-        tst_psMatrix05 \
-        tst_psMatrix06 \
-        tst_psMatrix07 \
-        tst_psMatrixVectorArithmetic01 \
-        tst_psMatrixVectorArithmetic02 \
-        tst_psMatrixVectorArithmetic03 \
-        tst_psMatrixVectorArithmetic04 \
-        tst_psMinimize04 \
-        tst_psMinimize04_F32 \
-        tst_psMinimize04b \
-        tst_psMinimize04b_F32 \
-        tst_psMinimize05 \
-        tst_psMinimize06 \
-        tst_psStats00 \
-        tst_psStats01 \
-        tst_psStats02 \
-        tst_psStats03 \
-        tst_psStats05 \
-        tst_psStats06 \
-        tst_psStats07 \
-        tst_psStats08 \
-        tst_psStats09 \
-        tst_psRandom
-#       tst_psMinimize00 \
-#       tst_psMinimize01 \
-#       tst_psMinimize02 \
-#       tst_psMinimize03
+    tst_psFunc00 \
+    tst_psFunc01 \
+    tst_psFunc02 \
+    tst_psFunc03 \
+    tst_psFunc04 \
+    tst_psFunc05 \
+    tst_psFunc07 \
+    tst_psFunc08 \
+    tst_psFunc09 \
+    tst_psFunc10 \
+    tst_psFunc11 \
+    tst_psHist00 \
+    tst_psHist01 \
+    tst_psHist02 \
+    tst_psHist03 \
+    tst_psMatrix01 \
+    tst_psMatrix02 \
+    tst_psMatrix03 \
+    tst_psMatrix04 \
+    tst_psMatrix05 \
+    tst_psMatrix06 \
+    tst_psMatrix07 \
+    tst_psMatrixVectorArithmetic01 \
+    tst_psMatrixVectorArithmetic02 \
+    tst_psMatrixVectorArithmetic03 \
+    tst_psMatrixVectorArithmetic04 \
+    tst_psMinimize04 \
+    tst_psMinimize04_F32 \
+    tst_psMinimize04b \
+    tst_psMinimize04b_F32 \
+    tst_psMinimize05 \
+    tst_psMinimize06 \
+    tst_psStats00 \
+    tst_psStats01 \
+    tst_psStats02 \
+    tst_psStats03 \
+    tst_psStats05 \
+    tst_psStats06 \
+    tst_psStats07 \
+    tst_psStats08 \
+    tst_psStats09 \
+    tst_psRandom
+#   tst_psMinimize00 \
+#   tst_psMinimize01 \
+#   tst_psMinimize02 \
+#   tst_psMinimize03
 
 tst_psFunc00_SOURCES =  tst_psFunc00.c
@@ -87 +87 @@
 tst_psMinimize05_SOURCES =  tst_psMinimize05.c
 tst_psMinimize06_SOURCES =  tst_psMinimize06.c
-tst_psMinimize07_SOURCES =  tst_psMinimize07.c
 tst_psStats00_SOURCES =  tst_psStats00.c
 tst_psStats01_SOURCES =  tst_psStats01.c

trunk/psLib/test/xml/Makefile

@@ -109 +109 @@
 LN_S = ln -s
 LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
+MAINT = 
+MAINTAINER_MODE_FALSE = #
+MAINTAINER_MODE_TRUE = 
 MAKEINFO = ${SHELL} /home/drobbin/panstarrs/temp/psLib/missing --run makeinfo
 OBJEXT = o
@@ -125 +125 @@
 PERL_PREFIX = /home/drobbin/panstarrs/temp/psLib
 POW_LIB = 
-PSLIB_CFLAGS = -I${prefix}/include
+PSLIB_CFLAGS = -I${prefix}/include -I/usr/include/libxml2
 PSLIB_LIBS =  -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm  -lcfitsio  -lfftw3f -L/usr/local/lib -lgsl -lgslcblas -lm -lxml2 -lz -lpthread -lm
 PSLIB_LT_VERSION = 0:6:0
@@ -203 +203 @@
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -228 +228 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: # $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh