Ignore:
Timestamp:
Nov 10, 2013, 2:22:53 AM (8 years ago)
Author:
Peter
Message:

refs #737

configure.ac: Define new variables YAT_LIBS, YAT_STATIC_LIBS, yat_libyat_la_LIBADD, YAT_PRIMARY_LIBS, and YAT_PC_LIBS (see code for definitions).

build_support/yat.pc.in: reflect new variables
build_support/yat-config.in: reflect new variables
build_support/gen_yat_pc.sh.in: reflect new variables
build_support/Makefile.am: reflect new variables
yat/Makefile.am: use AC_SUBSTed yat_libyat_la_LIBADD
test/static_test.sh: avoid redeclaring variable in generated Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/yat-config.in

    r2960 r3111  
    4040YAT_LDFLAGS="@YAT_LDFLAGS@"
    4141YAT_PRIMARY_LIBS="@YAT_PRIMARY_LIBS@"
    42 BAM_LIBS="@BAM_LIBS@"
     42YAT_STATIC_LIBS="@YAT_STATIC_LIBS@"
    4343LIBM="@LIBM@"
    4444
    45 if test "x$YAT_CBLAS_LIB" = "x"; then
    46   YAT_CBLAS_LIB="@YAT_CBLAS_LIB@"
    47 fi
     45# user is always right
     46test -z "$YAT_CBLAS_LIB" && YAT_CBLAS_LIB="@YAT_CBLAS_LIB@"
    4847
    4948LA_FILE="$libdir/libyat.la"
     
    143142    ;;
    144143    --libs)
    145     flags="$flags -lyat $BAM_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
     144    flags="$flags -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
    146145    ;;
    147146    --libs-without-cblas)
    148     flags="$flags -lyat $BAM_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
     147    flags="$flags -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
    149148    ;;
    150149    --ldflags)
     
    160159    ;;
    161160    --link-libtool)
    162     flags="$flags $LA_FILE $BAM_LIBS $YAT_CBLAS_LIB"
     161    flags="$flags $LA_FILE $YAT_STATIC_LIBS $YAT_CBLAS_LIB"
    163162    ;;
    164163    --yat-la-file)
Note: See TracChangeset for help on using the changeset viewer.