Changeset 2264

Timestamp:

May 27, 2010, 3:57:06 PM (13 years ago)

Author:

Peter

Message:

prefer hard-coding name yat because it increases readability and is more consistent.

Location:

trunk

Files:

• build_support/Makefile.am (modified) (1 diff)
• build_support/yat-config.in (modified) (2 diffs)
• build_support/yat.pc.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)

trunk/build_support/Makefile.am

@@ -59 +59 @@
   -e 's|@YAT_PATCH_VERSION[@]|$(YAT_PATCH_VERSION)|g' \
   -e 's|@YAT_DEV_BUILD[@]|$(YAT_DEV_BUILD)|g' \
-  -e 's|@YAT_LIBNAME[@]|$(YAT_LIBNAME)|g' \
   -e 's|@gsl_version[@]|$(gsl_version)|g' \
   -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \

trunk/build_support/yat-config.in

@@ -46 +46 @@
 fi
 
-LA_FILE="$libdir/lib@YAT_LIBNAME@.la"
+LA_FILE="$libdir/libyat.la"
 if test x$installed = xno; then
-  LA_FILE="@abs_top_builddir@/yat/lib@YAT_LIBNAME@.la"
+  LA_FILE="@abs_top_builddir@/yat/libyat.la"
 fi
 
@@ -142 +142 @@
     ;;
     --libs)
-    flags="$flags -l@YAT_LIBNAME@ $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
+    flags="$flags -lyat $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
     ;;
     --libs-without-cblas)
-    flags="$flags -l@YAT_LIBNAME@ $YAT_PRIMARY_LIBS $LIBM $LIBS"
+    flags="$flags -lyat $YAT_PRIMARY_LIBS $LIBM $LIBS"
     ;;
     --ldflags)

trunk/build_support/yat.pc.in

@@ -29 +29 @@
 Version: @VERSION@
 Requires: gsl >= @gsl_version@
-Libs: -L${libdir} -l@YAT_LIBNAME@ @YAT_LDFLAGS@ @LDFLAGS@
+Libs: -L${libdir} -lyat @YAT_LDFLAGS@ @LDFLAGS@
 Cflags: @YAT_CPPFLAGS@ @YAT_CXXFLAGS@ @CPPFLAGS@ @CXXFLAGS@ -I${includedir}

trunk/configure.ac

@@ -280 +280 @@
 CXXFLAGS=$yat_save_CXXFLAGS
 
-# yat specific settings
-YAT_LIBNAME="yat"
-YAT_LIB_LOCATION="yat"
-AC_SUBST(YAT_LIBNAME)
-AC_SUBST(YAT_LIB_LOCATION)
-
 #doxygen stuff
 DX_HTML_OUTPUT=html

trunk/test/Makefile.am

@@ -94 +94 @@
 TEST_EXTENSIONS = .sh
 
-LDADD = $(top_builddir)/$(YAT_LIB_LOCATION)/libyat.la libyattest.la $(YAT_LIBS)
+LDADD = $(top_builddir)/yat/libyat.la libyattest.la $(YAT_LIBS)
 
 libyattest_la_SOURCES = Suite.cc