Changeset 3237

Timestamp:

Feb 15, 2005, 2:50:43 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib

Files:

• configure.ac (modified) (5 diffs)
• pslib-config.in (modified) (1 diff)
• pslib.pc.in (modified) (1 diff)
• test/astronomy/Makefile.am (modified) (1 diff)
• test/collections/Makefile.am (modified) (1 diff)
• test/dataIO/Makefile.am (modified) (1 diff)
• test/dataManip/Makefile.am (modified) (1 diff)
• test/fileUtils/Makefile.am (modified) (1 diff)
• test/image/Makefile.am (modified) (1 diff)
• test/sysUtils/Makefile.am (modified) (1 diff)

trunk/psLib/configure.ac

@@ -39 +39 @@
 dnl Setup the info for psLib for pkg-config
 PSLIB_CFLAGS="-I${includedir}"
-PSLIB_LIBS="-L${libdir} -lpslib"
 
 dnl ----------------- CFITSIO options --------------------
@@ -53 +52 @@
 [CFITSIO_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS"
-LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
+dnl LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
 PSLIB_LIBS="${PSLIB_LIBS=} $CFITSIO_LDFLAGS -lcfitsio"
 AC_CHECK_HEADERS([fitsio.h],[],
@@ -70 +69 @@
 [FFTW3_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $FFTW3_CFLAGS"
-LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
+dnl LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
 PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f"
 AC_MSG_CHECKING([FFTW header files])
@@ -87 +86 @@
 AC_MSG_RESULT([${GSL_CFLAGS}])
 CFLAGS="${CFLAGS=} ${GSL_CFLAGS}"
-LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
+dnl LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
    
@@ -101 +100 @@
 AC_MSG_RESULT([${XML_CFLAGS}])
 CFLAGS="${CFLAGS=} ${XML_CFLAGS}"
-LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
+dnl LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
 

trunk/psLib/pslib-config.in

@@ -59 +59 @@
 
     --libs)
+        echo -L@libdir@ -lpslib @PSLIB_LIBS@
+        ;;
+    
+    --deps)
         echo @PSLIB_LIBS@
         ;;

trunk/psLib/pslib.pc.in

@@ -7 +7 @@
 Description: Pan-STARRS Library
 Version: @VERSION@
-Libs: @PSLIB_LIBS@ -lpslib @LIBS@
+Libs: -L@libdir@ -lpslib @PSLIB_LIBS@ @LIBS@
 Cflags: @PSLIB_CFLAGS@

trunk/psLib/test/astronomy/Makefile.am

@@ -11 +11 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 

trunk/psLib/test/collections/Makefile.am

@@ -13 +13 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \

trunk/psLib/test/dataIO/Makefile.am

@@ -13 +13 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DUTC_DAT_FILE="\"$(top_srcdir)/share/pslib/tai_utc.dat\""
 

trunk/psLib/test/dataManip/Makefile.am

@@ -13 +13 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \

trunk/psLib/test/fileUtils/Makefile.am

@@ -13 +13 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 AM_CFLAGS = -DUTC_DAT_FILE="\"$(top_srcdir)/share/pslib/tai_utc.dat\""
 

trunk/psLib/test/image/Makefile.am

@@ -13 +13 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \

trunk/psLib/test/sysUtils/Makefile.am

@@ -13 +13 @@
         $(all_includes)
 
-AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
 
 check_PROGRAMS = \