Changeset 1897


Ignore:
Timestamp:
Apr 16, 2009, 12:06:15 AM (12 years ago)
Author:
Peter
Message:

fixes #522. Introduced a variable YAT_PRIMARY_LIBS that is YAT_LIBS
minus cblas and mathlib. The variable made it easier to create needed
variables in yat-config (string addition is easier than subtraction,
whatever that means). Removed variable YAT_LIBS_WITHOUT_CBLAS because
it can easily be achied via "YAT_PRIMARY_LIBS LIBM".

Location:
trunk
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/Makefile.am

    r1892 r1897  
    4848  -e 's|@YAT_CXXFLAGS[@]|$(YAT_CXXFLAGS)|g' \
    4949  -e 's|@YAT_LDFLAGS[@]|$(YAT_LDFLAGS)|g' \
    50   -e 's|@YAT_LIBS[@]|$(YAT_LIBS)|g' \
     50  -e 's|@YAT_PRIMARY_LIBS[@]|$(YAT_PRIMARY_LIBS)|g' \
     51  -e 's|@LIBM[@]|$(LIBM)|g' \
    5152  -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
    5253  -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
  • trunk/build_support/yat-config.in

    r1892 r1897  
    3636YAT_CXXFLAGS="@YAT_CXXFLAGS@"
    3737YAT_LDFLAGS="@YAT_LDFLAGS@"
    38 YAT_LIBS="@YAT_LIBS@"
    39 
    40 # FIXME, this should honor environment variable
    41 YAT_CBLAS_LIB=@YAT_CBLAS_LIB@
     38YAT_PRIMARY_LIBS="@YAT_PRIMARY_LIBS@"
     39LIBM="@LIBM@"
     40
     41if test "x$YAT_CBLAS_LIB" = "x"; then
     42  YAT_CBLAS_LIB=@YAT_CBLAS_LIB@
     43fi
    4244
    4345LA_FILE="$libdir/lib@YAT_LIBNAME@.la"
     
    131133    ;;
    132134    --libs)
    133     flags="$flags -l@YAT_LIBNAME@ $YAT_LIBS $LIBS"
     135    flags="$flags -l@YAT_LIBNAME@ $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
    134136    ;;
    135137    --ldflags)
  • trunk/configure.ac

    r1896 r1897  
    408408APR_RESTORE_THE_ENVIRONMENT(CXXFLAGS, YAT_)
    409409APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, YAT_)
    410 APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_)
     410APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_PRIMARY_)
     411
     412# remove cblas and m
     413APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$YAT_CBLAS_LIB])
     414APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$LIBM])
     415
     416YAT_LIBS="$YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM"
     417AC_SUBST(YAT_LIBS)
    411418
    412419# set and AC_SUBST variables that are interpreted by Automake
     
    419426AC_SUBST(AM_LDFLAGS)
    420427
    421 
    422 YAT_LIBS_WITHOUT_CBLAS=$YAT_LIBS
    423 APR_REMOVEFROM([YAT_LIBS_WITHOUT_CBLAS], [$YAT_CBLAS_LIB])
    424 AC_SUBST(YAT_LIBS_WITHOUT_CBLAS)
    425428
    426429# Create output.
  • trunk/test/Makefile.am

    r1892 r1897  
    7373TESTS += documentation_test.sh
    7474
    75 DISTRIBUTED_TESTS = yat_cpp_add_flag_test.sh \
     75DISTRIBUTED_TESTS = \
     76yat_config_cblas_test.sh \
     77yat_cpp_add_flag_test.sh \
    7678yat_cxx_add_flag_test.sh \
    7779yat_ld_add_flag_test.sh \
  • trunk/yat/Makefile.am

    r1892 r1897  
    4040  statistics/libstatistics.la \
    4141  utility/libutility.la \
    42   $(YAT_LIBS_WITHOUT_CBLAS)
     42  $(YAT_PRIMARY_LIBS) $(LIBM)
Note: See TracChangeset for help on using the changeset viewer.