Module: xenomai-forge
Branch: master
Commit: b48151c91a78ae261f2ec06db40f38f4fe04e7b2
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=b48151c91a78ae261f2ec06db40f38f4fe04e7b2
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu May 31 21:25:49 2012 +0200
build: fix up for autoconf 2.68
---
Makefile.in | 2 +-
config/Makefile.in | 2 +-
configure | 13 +++++----
configure.in | 14 ++++++----
doc/Makefile.in | 2 +-
doc/docbook/Makefile.in | 2 +-
doc/docbook/custom-stylesheets/Makefile.in | 2 +-
doc/docbook/custom-stylesheets/xsl/Makefile.in | 2 +-
.../custom-stylesheets/xsl/common/Makefile.in | 2 +-
doc/docbook/custom-stylesheets/xsl/fo/Makefile.in | 2 +-
.../custom-stylesheets/xsl/html/Makefile.in | 2 +-
doc/doxygen/Makefile.in | 2 +-
doc/man/Makefile.in | 2 +-
doc/txt/Makefile.in | 2 +-
include/Makefile.in | 2 +-
include/alchemy/Makefile.in | 2 +-
include/analogy/Makefile.in | 2 +-
include/asm-arm/Makefile.in | 2 +-
include/asm-arm/bits/Makefile.in | 2 +-
include/asm-blackfin/Makefile.in | 2 +-
include/asm-blackfin/bits/Makefile.in | 2 +-
include/asm-generic/Makefile.in | 2 +-
include/asm-generic/bits/Makefile.in | 2 +-
include/asm-generic/ipipe/Makefile.in | 2 +-
include/asm-nios2/Makefile.in | 2 +-
include/asm-nios2/bits/Makefile.in | 2 +-
include/asm-powerpc/Makefile.in | 2 +-
include/asm-powerpc/bits/Makefile.in | 2 +-
include/asm-sh/Makefile.in | 2 +-
include/asm-sh/bits/Makefile.in | 2 +-
include/asm-x86/Makefile.in | 2 +-
include/asm-x86/bits/Makefile.in | 2 +-
include/cobalt/Makefile.in | 2 +-
include/cobalt/nucleus/Makefile.in | 2 +-
include/cobalt/sys/Makefile.in | 2 +-
include/copperplate/Makefile.in | 2 +-
include/mercury/Makefile.in | 2 +-
include/psos/Makefile.in | 2 +-
include/rtdm/Makefile.in | 2 +-
include/vxworks/Makefile.in | 2 +-
lib/Makefile.in | 2 +-
lib/alchemy/Makefile.in | 2 +-
lib/analogy/Makefile.in | 2 +-
lib/cobalt/Makefile.in | 2 +-
lib/copperplate/Makefile.in | 2 +-
lib/include/Makefile.in | 2 +-
lib/psos/Makefile.in | 2 +-
lib/vxworks/Makefile.in | 2 +-
scripts/Makefile.in | 2 +-
testsuite/Makefile.in | 2 +-
testsuite/clocktest/Makefile.am | 7 +++--
testsuite/clocktest/Makefile.in | 7 +++--
testsuite/cyclic/Makefile.am | 7 +++--
testsuite/cyclic/Makefile.in | 7 +++--
testsuite/latency/Makefile.am | 3 +-
testsuite/latency/Makefile.in | 5 ++-
testsuite/regression/Makefile.in | 2 +-
testsuite/regression/posix/Makefile.am | 7 +++--
testsuite/regression/posix/Makefile.in | 7 +++--
testsuite/switchtest/Makefile.am | 7 +++--
testsuite/switchtest/Makefile.in | 7 +++--
testsuite/unit/Makefile.am | 18 +++++++++----
testsuite/unit/Makefile.in | 20 +++++++++-----
testsuite/xeno-test/Makefile.in | 2 +-
utils/Makefile.in | 2 +-
utils/analogy/Makefile.am | 24 +++++++++++------
utils/analogy/Makefile.in | 27 +++++++++++--------
utils/can/Makefile.am | 12 +++++---
utils/can/Makefile.in | 15 ++++++-----
utils/ps/Makefile.in | 2 +-
utils/slackspot/Makefile.in | 2 +-
71 files changed, 176 insertions(+), 137 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9976cfb..4465f98 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -212,7 +212,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/config/Makefile.in b/config/Makefile.in
index 7f0013a..0f6fd47 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -156,7 +156,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/configure b/configure
index 7607e7f..14d1ecf 100755
--- a/configure
+++ b/configure
@@ -621,7 +621,7 @@ XENO_TEST_DIR
XENO_FUSE_CFLAGS
XENO_USER_APP_LDFLAGS
XENO_USER_APP_CFLAGS
-XENO_USER_LDFLAGS
+XENO_USER_LDADD
XENO_USER_CFLAGS
XENO_LIB_LDFLAGS
XENO_HOST_STRING
@@ -12779,7 +12779,8 @@ if ${ac_cv_lib_fuse_fuse_new+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfuse $LIBS"
+LIBS="-lfuse -lpthread -lrt -ldl
+ $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12818,7 +12819,6 @@ _ACEOF
else
as_fn_error $? "Cannot find libfuse (FUSE development package) on this
system" "$LINENO" 5
-
fi
CPPFLAGS="$save_CPPFLAGS"
@@ -13502,6 +13502,7 @@ if ${ac_cv_atomic_builtins+:} false; then :
$as_echo_n "(cached) " >&6
else
+LIBS=
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13530,15 +13531,15 @@ if test "$ac_cv_atomic_builtins" != "yes"; then
fi
XENO_USER_CFLAGS="-D_GNU_SOURCE -D_REENTRANT -fstrict-aliasing -Wall -pipe
-Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wno-unused-parameter
-Werror"
-XENO_USER_LDFLAGS=
+XENO_USER_LDADD=
if test x$use_registry = xy; then
XENO_FUSE_CFLAGS=$fuse_cflags
- XENO_USER_LDFLAGS="$XENO_USER_LDFLAGS $fuse_ldflags"
+ XENO_USER_LDADD="$XENO_USER_LDADD $fuse_ldflags"
fi
XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
-XENO_USER_APP_LDFLAGS=$XENO_USER_LDFLAGS
+XENO_USER_APP_LDFLAGS=$XENO_USER_LDADD
if test x$debug_mode = xpartial; then
XENO_USER_CFLAGS="-g -O2 -D__XENO_DEBUG__ $XENO_USER_CFLAGS
-fno-omit-frame-pointer"
diff --git a/configure.in b/configure.in
index f3126e9..90404d4 100644
--- a/configure.in
+++ b/configure.in
@@ -269,7 +269,8 @@ if test x$use_registry = xy; then
AC_MSG_ERROR([Cannot find fuse.h (part of libfuse development
package) on this system])
)
AC_CHECK_LIB(fuse, fuse_new,,
- AC_MSG_ERROR([Cannot find libfuse (FUSE development package) on
this system])
+ AC_MSG_ERROR([Cannot find libfuse (FUSE development package) on
this system]),
+ [-lpthread -lrt -ldl]
)
CPPFLAGS="$save_CPPFLAGS"
AC_LANG_RESTORE
@@ -495,6 +496,7 @@ dnl Check for atomic builtins. For now we only check for
the legacy
dnl interface, i.e. __sync_*.
AC_CACHE_CHECK([whether the compiler provides atomic builtins],
ac_cv_atomic_builtins, [
+LIBS=
AC_TRY_LINK([
int atomic_sub(int i) { return __sync_sub_and_fetch(&i, 1); }
int atomic_add(int i) { return __sync_add_and_fetch(&i, 1); }
@@ -506,16 +508,16 @@ fi
dnl Common CFLAGS and LDFLAGS
XENO_USER_CFLAGS="-D_GNU_SOURCE -D_REENTRANT -fstrict-aliasing -Wall -pipe
-Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wno-unused-parameter
-Werror"
-XENO_USER_LDFLAGS=
+XENO_USER_LDADD=
if test x$use_registry = xy; then
XENO_FUSE_CFLAGS=$fuse_cflags
- XENO_USER_LDFLAGS="$XENO_USER_LDFLAGS $fuse_ldflags"
+ XENO_USER_LDADD="$XENO_USER_LDADD $fuse_ldflags"
fi
dnl Exported CFLAGS and LDFLAGS, may be enhanced per-arch below
XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
-XENO_USER_APP_LDFLAGS=$XENO_USER_LDFLAGS
+XENO_USER_APP_LDFLAGS=$XENO_USER_LDADD
if test x$debug_mode = xpartial; then
XENO_USER_CFLAGS="-g -O2 -D__XENO_DEBUG__ $XENO_USER_CFLAGS
-fno-omit-frame-pointer"
@@ -541,7 +543,7 @@ AC_CACHE_VAL(ac_cv_ld_file_option,
AC_LANG_C
save_LDFLAGS="$LDFLAGS"
[LDFLAGS="-Wl,@/dev/null"]
- AC_LINK_IFELSE([main(){}],
+ AC_LINK_IFELSE([AC_LANG_SOURCE([main(){}])],
[ac_cv_ld_file_option=yes],
[ac_cv_ld_file_option=no])
LDFLAGS="$save_LDFLAGS"
@@ -637,7 +639,7 @@ AC_SUBST(XENO_BUILD_STRING)
AC_SUBST(XENO_HOST_STRING)
AC_SUBST(XENO_LIB_LDFLAGS)
AC_SUBST(XENO_USER_CFLAGS)
-AC_SUBST(XENO_USER_LDFLAGS)
+AC_SUBST(XENO_USER_LDADD)
AC_SUBST(XENO_USER_APP_CFLAGS)
AC_SUBST(XENO_USER_APP_LDFLAGS)
AC_SUBST(XENO_FUSE_CFLAGS)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index bb0c286..12d9646 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -195,7 +195,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/docbook/Makefile.in b/doc/docbook/Makefile.in
index 6139068..89996d0 100644
--- a/doc/docbook/Makefile.in
+++ b/doc/docbook/Makefile.in
@@ -197,7 +197,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/docbook/custom-stylesheets/Makefile.in
b/doc/docbook/custom-stylesheets/Makefile.in
index b51e124..e86b4c4 100644
--- a/doc/docbook/custom-stylesheets/Makefile.in
+++ b/doc/docbook/custom-stylesheets/Makefile.in
@@ -195,7 +195,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/docbook/custom-stylesheets/xsl/Makefile.in
b/doc/docbook/custom-stylesheets/xsl/Makefile.in
index c91ce76..6b2361e 100644
--- a/doc/docbook/custom-stylesheets/xsl/Makefile.in
+++ b/doc/docbook/custom-stylesheets/xsl/Makefile.in
@@ -195,7 +195,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/docbook/custom-stylesheets/xsl/common/Makefile.in
b/doc/docbook/custom-stylesheets/xsl/common/Makefile.in
index 33e56fb..70e0ae4 100644
--- a/doc/docbook/custom-stylesheets/xsl/common/Makefile.in
+++ b/doc/docbook/custom-stylesheets/xsl/common/Makefile.in
@@ -155,7 +155,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/docbook/custom-stylesheets/xsl/fo/Makefile.in
b/doc/docbook/custom-stylesheets/xsl/fo/Makefile.in
index 6271a4c..52f1f88 100644
--- a/doc/docbook/custom-stylesheets/xsl/fo/Makefile.in
+++ b/doc/docbook/custom-stylesheets/xsl/fo/Makefile.in
@@ -155,7 +155,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/docbook/custom-stylesheets/xsl/html/Makefile.in
b/doc/docbook/custom-stylesheets/xsl/html/Makefile.in
index 686a880..54ef67b 100644
--- a/doc/docbook/custom-stylesheets/xsl/html/Makefile.in
+++ b/doc/docbook/custom-stylesheets/xsl/html/Makefile.in
@@ -157,7 +157,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index 3829356..48f3073 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -160,7 +160,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 97a4678..efbd8e7 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -193,7 +193,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/doc/txt/Makefile.in b/doc/txt/Makefile.in
index 1b333a8..1e02387 100644
--- a/doc/txt/Makefile.in
+++ b/doc/txt/Makefile.in
@@ -186,7 +186,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/Makefile.in b/include/Makefile.in
index cf97e97..2469d31 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -229,7 +229,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/alchemy/Makefile.in b/include/alchemy/Makefile.in
index 6eb8539..7ae0782 100644
--- a/include/alchemy/Makefile.in
+++ b/include/alchemy/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/analogy/Makefile.in b/include/analogy/Makefile.in
index 68a59f6..3c0bd9d 100644
--- a/include/analogy/Makefile.in
+++ b/include/analogy/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-arm/Makefile.in b/include/asm-arm/Makefile.in
index 9aad492..03c3f0e 100644
--- a/include/asm-arm/Makefile.in
+++ b/include/asm-arm/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-arm/bits/Makefile.in b/include/asm-arm/bits/Makefile.in
index 20083c9..47a9617 100644
--- a/include/asm-arm/bits/Makefile.in
+++ b/include/asm-arm/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-blackfin/Makefile.in b/include/asm-blackfin/Makefile.in
index 6c8c3b0..a11ebce 100644
--- a/include/asm-blackfin/Makefile.in
+++ b/include/asm-blackfin/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-blackfin/bits/Makefile.in
b/include/asm-blackfin/bits/Makefile.in
index 7f341a8..97c1787 100644
--- a/include/asm-blackfin/bits/Makefile.in
+++ b/include/asm-blackfin/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-generic/Makefile.in b/include/asm-generic/Makefile.in
index a546e1f..51cb1b3 100644
--- a/include/asm-generic/Makefile.in
+++ b/include/asm-generic/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-generic/bits/Makefile.in
b/include/asm-generic/bits/Makefile.in
index aae1c94..06ec699 100644
--- a/include/asm-generic/bits/Makefile.in
+++ b/include/asm-generic/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-generic/ipipe/Makefile.in
b/include/asm-generic/ipipe/Makefile.in
index 3a4b50c..0b2159f 100644
--- a/include/asm-generic/ipipe/Makefile.in
+++ b/include/asm-generic/ipipe/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-nios2/Makefile.in b/include/asm-nios2/Makefile.in
index a8681c5..d5eaff1 100644
--- a/include/asm-nios2/Makefile.in
+++ b/include/asm-nios2/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-nios2/bits/Makefile.in
b/include/asm-nios2/bits/Makefile.in
index 21b8a1a..113f3f3 100644
--- a/include/asm-nios2/bits/Makefile.in
+++ b/include/asm-nios2/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-powerpc/Makefile.in b/include/asm-powerpc/Makefile.in
index d650637..0c32213 100644
--- a/include/asm-powerpc/Makefile.in
+++ b/include/asm-powerpc/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-powerpc/bits/Makefile.in
b/include/asm-powerpc/bits/Makefile.in
index 52f7437..95ca39d 100644
--- a/include/asm-powerpc/bits/Makefile.in
+++ b/include/asm-powerpc/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-sh/Makefile.in b/include/asm-sh/Makefile.in
index 650a600..fc6d483 100644
--- a/include/asm-sh/Makefile.in
+++ b/include/asm-sh/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-sh/bits/Makefile.in b/include/asm-sh/bits/Makefile.in
index fd53113..5f4c8f0 100644
--- a/include/asm-sh/bits/Makefile.in
+++ b/include/asm-sh/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-x86/Makefile.in b/include/asm-x86/Makefile.in
index 4362219..ef7c2c9 100644
--- a/include/asm-x86/Makefile.in
+++ b/include/asm-x86/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/asm-x86/bits/Makefile.in b/include/asm-x86/bits/Makefile.in
index 8909698..9c13a98 100644
--- a/include/asm-x86/bits/Makefile.in
+++ b/include/asm-x86/bits/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/cobalt/Makefile.in b/include/cobalt/Makefile.in
index 3cedcc0..62f65c4 100644
--- a/include/cobalt/Makefile.in
+++ b/include/cobalt/Makefile.in
@@ -226,7 +226,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/cobalt/nucleus/Makefile.in
b/include/cobalt/nucleus/Makefile.in
index 76e2eb7..0d6c0fe 100644
--- a/include/cobalt/nucleus/Makefile.in
+++ b/include/cobalt/nucleus/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/cobalt/sys/Makefile.in b/include/cobalt/sys/Makefile.in
index e8e6110..636ed8f 100644
--- a/include/cobalt/sys/Makefile.in
+++ b/include/cobalt/sys/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in
index 08f1598..78a46d7 100644
--- a/include/copperplate/Makefile.in
+++ b/include/copperplate/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/mercury/Makefile.in b/include/mercury/Makefile.in
index 9bfdd62..7d9f359 100644
--- a/include/mercury/Makefile.in
+++ b/include/mercury/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/psos/Makefile.in b/include/psos/Makefile.in
index 6e05732..d99b0da 100644
--- a/include/psos/Makefile.in
+++ b/include/psos/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/rtdm/Makefile.in b/include/rtdm/Makefile.in
index 4681732..67dacd8 100644
--- a/include/rtdm/Makefile.in
+++ b/include/rtdm/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/include/vxworks/Makefile.in b/include/vxworks/Makefile.in
index b0067fa..b021130 100644
--- a/include/vxworks/Makefile.in
+++ b/include/vxworks/Makefile.in
@@ -188,7 +188,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1ac4cdc..14db524 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -199,7 +199,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/alchemy/Makefile.in b/lib/alchemy/Makefile.in
index e186a53..35a533c 100644
--- a/lib/alchemy/Makefile.in
+++ b/lib/alchemy/Makefile.in
@@ -221,7 +221,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/analogy/Makefile.in b/lib/analogy/Makefile.in
index 5365b90..e7c50e6 100644
--- a/lib/analogy/Makefile.in
+++ b/lib/analogy/Makefile.in
@@ -209,7 +209,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cobalt/Makefile.in b/lib/cobalt/Makefile.in
index 9d37687..8bc2048 100644
--- a/lib/cobalt/Makefile.in
+++ b/lib/cobalt/Makefile.in
@@ -218,7 +218,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in
index 14bc4df..13b21dd 100644
--- a/lib/copperplate/Makefile.in
+++ b/lib/copperplate/Makefile.in
@@ -260,7 +260,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in
index 633e5a3..78d7ae0 100644
--- a/lib/include/Makefile.in
+++ b/lib/include/Makefile.in
@@ -156,7 +156,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/psos/Makefile.in b/lib/psos/Makefile.in
index 09e0174..b6f3d18 100644
--- a/lib/psos/Makefile.in
+++ b/lib/psos/Makefile.in
@@ -209,7 +209,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/vxworks/Makefile.in b/lib/vxworks/Makefile.in
index eda02e9..347bde2 100644
--- a/lib/vxworks/Makefile.in
+++ b/lib/vxworks/Makefile.in
@@ -214,7 +214,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index d4a9d49..9632ef6 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -186,7 +186,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3154602..340d3c6 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -204,7 +204,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/testsuite/clocktest/Makefile.am b/testsuite/clocktest/Makefile.am
index c0b4445..aa2f3dc 100644
--- a/testsuite/clocktest/Makefile.am
+++ b/testsuite/clocktest/Makefile.am
@@ -11,8 +11,9 @@ clocktest_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-clocktest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+clocktest_LDFLAGS = $(XENO_POSIX_WRAPPERS)
-clocktest_LDADD = \
- ../../lib/cobalt/libcobalt.la \
+clocktest_LDADD = \
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt
diff --git a/testsuite/clocktest/Makefile.in b/testsuite/clocktest/Makefile.in
index d669ca7..1cf506d 100644
--- a/testsuite/clocktest/Makefile.in
+++ b/testsuite/clocktest/Makefile.in
@@ -179,7 +179,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -245,9 +245,10 @@ clocktest_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-clocktest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+clocktest_LDFLAGS = $(XENO_POSIX_WRAPPERS)
clocktest_LDADD = \
- ../../lib/cobalt/libcobalt.la \
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt
all: all-am
diff --git a/testsuite/cyclic/Makefile.am b/testsuite/cyclic/Makefile.am
index d0ee485..f1ced61 100644
--- a/testsuite/cyclic/Makefile.am
+++ b/testsuite/cyclic/Makefile.am
@@ -11,8 +11,9 @@ cyclictest_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes -DIPIPE_TRACE=1
-cyclictest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+cyclictest_LDFLAGS = $(XENO_POSIX_WRAPPERS)
-cyclictest_LDADD = \
- ../../lib/cobalt/libcobalt.la \
+cyclictest_LDADD = \
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt
diff --git a/testsuite/cyclic/Makefile.in b/testsuite/cyclic/Makefile.in
index 205b9d3..a7d2d16 100644
--- a/testsuite/cyclic/Makefile.in
+++ b/testsuite/cyclic/Makefile.in
@@ -179,7 +179,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -245,9 +245,10 @@ cyclictest_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes -DIPIPE_TRACE=1
-cyclictest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+cyclictest_LDFLAGS = $(XENO_POSIX_WRAPPERS)
cyclictest_LDADD = \
- ../../lib/cobalt/libcobalt.la \
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt
all: all-am
diff --git a/testsuite/latency/Makefile.am b/testsuite/latency/Makefile.am
index 8b39f36..5a1060e 100644
--- a/testsuite/latency/Makefile.am
+++ b/testsuite/latency/Makefile.am
@@ -9,7 +9,7 @@ latency_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-latency_LDFLAGS = @XENO_USER_LDFLAGS@
+latency_LDFLAGS =
core_libs =
if XENO_COBALT
@@ -20,4 +20,5 @@ latency_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(core_libs) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
diff --git a/testsuite/latency/Makefile.in b/testsuite/latency/Makefile.in
index 1bf7e3a..58d5192 100644
--- a/testsuite/latency/Makefile.in
+++ b/testsuite/latency/Makefile.in
@@ -182,7 +182,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -247,12 +247,13 @@ latency_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-latency_LDFLAGS = @XENO_USER_LDFLAGS@
+latency_LDFLAGS =
core_libs = $(am__append_1)
latency_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(core_libs) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
all: all-am
diff --git a/testsuite/regression/Makefile.in b/testsuite/regression/Makefile.in
index 6de0d68..536aac0 100644
--- a/testsuite/regression/Makefile.in
+++ b/testsuite/regression/Makefile.in
@@ -195,7 +195,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/testsuite/regression/posix/Makefile.am
b/testsuite/regression/posix/Makefile.am
index fc88e1b..c22c4a7 100644
--- a/testsuite/regression/posix/Makefile.am
+++ b/testsuite/regression/posix/Makefile.am
@@ -9,8 +9,9 @@ test_PROGRAMS = leaks
CPPFLAGS = $(XENO_USER_CFLAGS) \
-I$(top_srcdir)/include
-LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+LDFLAGS = $(XENO_POSIX_WRAPPERS)
-LDADD = \
- ../../../lib/cobalt/libcobalt.la \
+LDADD = \
+ ../../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
diff --git a/testsuite/regression/posix/Makefile.in
b/testsuite/regression/posix/Makefile.in
index 609555c..9a30f2b 100644
--- a/testsuite/regression/posix/Makefile.in
+++ b/testsuite/regression/posix/Makefile.in
@@ -136,7 +136,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LATEX_BATCHMODE = @LATEX_BATCHMODE@
LATEX_MODE = @LATEX_MODE@
LD = @LD@
-LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+LDFLAGS = $(XENO_POSIX_WRAPPERS)
LD_FILE_OPTION = @LD_FILE_OPTION@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -182,7 +182,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -244,7 +244,8 @@ testdir = @XENO_TEST_DIR@
CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
noinst_HEADERS = check.h
LDADD = \
- ../../../lib/cobalt/libcobalt.la \
+ ../../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
all: all-am
diff --git a/testsuite/switchtest/Makefile.am b/testsuite/switchtest/Makefile.am
index fd1061a..9507176 100644
--- a/testsuite/switchtest/Makefile.am
+++ b/testsuite/switchtest/Makefile.am
@@ -11,8 +11,9 @@ switchtest_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-switchtest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+switchtest_LDFLAGS = $(XENO_POSIX_WRAPPERS)
-switchtest_LDADD = \
- ../../lib/cobalt/libcobalt.la \
+switchtest_LDADD = \
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt
diff --git a/testsuite/switchtest/Makefile.in b/testsuite/switchtest/Makefile.in
index b234a99..04a5e24 100644
--- a/testsuite/switchtest/Makefile.in
+++ b/testsuite/switchtest/Makefile.in
@@ -179,7 +179,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -245,9 +245,10 @@ switchtest_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-switchtest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS)
+switchtest_LDFLAGS = $(XENO_POSIX_WRAPPERS)
switchtest_LDADD = \
- ../../lib/cobalt/libcobalt.la \
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@ \
-lpthread -lrt
all: all-am
diff --git a/testsuite/unit/Makefile.am b/testsuite/unit/Makefile.am
index 8d22a58..1e5773f 100644
--- a/testsuite/unit/Makefile.am
+++ b/testsuite/unit/Makefile.am
@@ -22,12 +22,13 @@ arith_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-arith_LDFLAGS = @XENO_USER_LDFLAGS@
+arith_LDFLAGS =
arith_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
mutex_torture_SOURCES = mutex-torture.c
@@ -38,12 +39,13 @@ mutex_torture_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-mutex_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS) @XENO_USER_LDFLAGS@
+mutex_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS)
mutex_torture_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
cond_torture_SOURCES = cond-torture.c
@@ -54,12 +56,13 @@ cond_torture_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-cond_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS) @XENO_USER_LDFLAGS@
+cond_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS)
cond_torture_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
check_vdso_SOURCES = check-vdso.c
@@ -69,10 +72,11 @@ check_vdso_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
+check_vdso_LDFLAGS =
check_vdso_LDADD = \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
else
@@ -86,12 +90,13 @@ wakeup_time_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-wakeup_time_LDFLAGS = @XENO_USER_LDFLAGS@
+wakeup_time_LDFLAGS =
wakeup_time_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
rtdm_SOURCES = rtdm.c
@@ -102,10 +107,11 @@ rtdm_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-rtdm_LDFLAGS = $(XENO_POSIX_WRAPPERS) @XENO_USER_LDFLAGS@
+rtdm_LDFLAGS = $(XENO_POSIX_WRAPPERS)
rtdm_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
diff --git a/testsuite/unit/Makefile.in b/testsuite/unit/Makefile.in
index 5d9a4b9..742cf6f 100644
--- a/testsuite/unit/Makefile.in
+++ b/testsuite/unit/Makefile.in
@@ -242,7 +242,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -310,11 +310,12 @@ CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
@XENO_COBALT_TRUE@ -I$(top_srcdir)/include \
@XENO_COBALT_TRUE@ -Wno-missing-prototypes
-@XENO_COBALT_TRUE@arith_LDFLAGS = @XENO_USER_LDFLAGS@
+@XENO_COBALT_TRUE@arith_LDFLAGS =
@XENO_COBALT_TRUE@arith_LDADD = \
@XENO_COBALT_TRUE@ ../../lib/alchemy/libalchemy.la \
@XENO_COBALT_TRUE@ ../../lib/copperplate/libcopperplate.la \
@XENO_COBALT_TRUE@ $(coredep_lib) \
+@XENO_COBALT_TRUE@ @XENO_USER_LDADD@ \
@XENO_COBALT_TRUE@ -lpthread -lrt -lm
@XENO_COBALT_TRUE@mutex_torture_SOURCES = mutex-torture.c
@@ -324,11 +325,12 @@ CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
@XENO_COBALT_TRUE@ -I$(top_srcdir)/include \
@XENO_COBALT_TRUE@ -Wno-missing-prototypes
-@XENO_COBALT_TRUE@mutex_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS)
@XENO_USER_LDFLAGS@
+@XENO_COBALT_TRUE@mutex_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS)
@XENO_COBALT_TRUE@mutex_torture_LDADD = \
@XENO_COBALT_TRUE@ ../../lib/alchemy/libalchemy.la \
@XENO_COBALT_TRUE@ ../../lib/copperplate/libcopperplate.la \
@XENO_COBALT_TRUE@ $(coredep_lib) \
+@XENO_COBALT_TRUE@ @XENO_USER_LDADD@ \
@XENO_COBALT_TRUE@ -lpthread -lrt -lm
@XENO_COBALT_TRUE@cond_torture_SOURCES = cond-torture.c
@@ -338,11 +340,12 @@ CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
@XENO_COBALT_TRUE@ -I$(top_srcdir)/include \
@XENO_COBALT_TRUE@ -Wno-missing-prototypes
-@XENO_COBALT_TRUE@cond_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS)
@XENO_USER_LDFLAGS@
+@XENO_COBALT_TRUE@cond_torture_LDFLAGS = $(XENO_POSIX_WRAPPERS)
@XENO_COBALT_TRUE@cond_torture_LDADD = \
@XENO_COBALT_TRUE@ ../../lib/alchemy/libalchemy.la \
@XENO_COBALT_TRUE@ ../../lib/copperplate/libcopperplate.la \
@XENO_COBALT_TRUE@ $(coredep_lib) \
+@XENO_COBALT_TRUE@ @XENO_USER_LDADD@ \
@XENO_COBALT_TRUE@ -lpthread -lrt -lm
@XENO_COBALT_TRUE@check_vdso_SOURCES = check-vdso.c
@@ -351,9 +354,10 @@ CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
@XENO_COBALT_TRUE@ -I$(top_srcdir)/include \
@XENO_COBALT_TRUE@ -Wno-missing-prototypes
-@XENO_COBALT_TRUE@check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
+@XENO_COBALT_TRUE@check_vdso_LDFLAGS =
@XENO_COBALT_TRUE@check_vdso_LDADD = \
@XENO_COBALT_TRUE@ $(coredep_lib) \
+@XENO_COBALT_TRUE@ @XENO_USER_LDADD@ \
@XENO_COBALT_TRUE@ -lpthread -lrt -lm
wakeup_time_SOURCES = wakeup-time.c
@@ -362,11 +366,12 @@ wakeup_time_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-wakeup_time_LDFLAGS = @XENO_USER_LDFLAGS@
+wakeup_time_LDFLAGS =
wakeup_time_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
rtdm_SOURCES = rtdm.c
@@ -376,11 +381,12 @@ rtdm_CPPFLAGS = \
-I$(top_srcdir)/include \
-Wno-missing-prototypes
-rtdm_LDFLAGS = $(XENO_POSIX_WRAPPERS) @XENO_USER_LDFLAGS@
+rtdm_LDFLAGS = $(XENO_POSIX_WRAPPERS)
rtdm_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
$(coredep_lib) \
+ @XENO_USER_LDADD@ \
-lpthread -lrt -lm
all: all-am
diff --git a/testsuite/xeno-test/Makefile.in b/testsuite/xeno-test/Makefile.in
index 28eb26b..0203319 100644
--- a/testsuite/xeno-test/Makefile.in
+++ b/testsuite/xeno-test/Makefile.in
@@ -207,7 +207,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 52a885e..7e7c7e2 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -195,7 +195,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/utils/analogy/Makefile.am b/utils/analogy/Makefile.am
index 000e505..6b1e31d 100644
--- a/utils/analogy/Makefile.am
+++ b/utils/analogy/Makefile.am
@@ -13,8 +13,7 @@ CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
-LDFLAGS = \
- @XENO_USER_LDFLAGS@
+LDFLAGS =
noinst_HEADERS = wf_facilities.h
@@ -25,41 +24,48 @@ libwaveform_la_SOURCES = wf_facilities.c
analogy_config_SOURCES = analogy_config.c
analogy_config_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
cmd_read_SOURCES = cmd_read.c
cmd_read_LDADD = \
../../lib/analogy/libanalogy.la \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
cmd_write_SOURCES = cmd_write.c
cmd_write_LDADD = \
../../lib/analogy/libanalogy.la \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
cmd_bits_SOURCES = cmd_bits.c
cmd_bits_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
insn_read_SOURCES = insn_read.c
insn_read_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
insn_write_SOURCES = insn_write.c
insn_write_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
insn_bits_SOURCES = insn_bits.c
insn_bits_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
wf_generate_SOURCES = wf_generate.c
wf_generate_LDADD = ./libwaveform.la -lm
diff --git a/utils/analogy/Makefile.in b/utils/analogy/Makefile.in
index d4f222b..0007ebf 100644
--- a/utils/analogy/Makefile.in
+++ b/utils/analogy/Makefile.in
@@ -183,9 +183,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LATEX_BATCHMODE = @LATEX_BATCHMODE@
LATEX_MODE = @LATEX_MODE@
LD = @LD@
-LDFLAGS = \
- @XENO_USER_LDFLAGS@
-
+LDFLAGS =
LD_FILE_OPTION = @LD_FILE_OPTION@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -231,7 +229,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -295,41 +293,48 @@ libwaveform_la_SOURCES = wf_facilities.c
analogy_config_SOURCES = analogy_config.c
analogy_config_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
cmd_read_SOURCES = cmd_read.c
cmd_read_LDADD = \
../../lib/analogy/libanalogy.la \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
cmd_write_SOURCES = cmd_write.c
cmd_write_LDADD = \
../../lib/analogy/libanalogy.la \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
cmd_bits_SOURCES = cmd_bits.c
cmd_bits_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
insn_read_SOURCES = insn_read.c
insn_read_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
insn_write_SOURCES = insn_write.c
insn_write_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
insn_bits_SOURCES = insn_bits.c
insn_bits_LDADD = \
../../lib/analogy/libanalogy.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
wf_generate_SOURCES = wf_generate.c
wf_generate_LDADD = ./libwaveform.la -lm
diff --git a/utils/can/Makefile.am b/utils/can/Makefile.am
index b7c0adb..2b15d86 100644
--- a/utils/can/Makefile.am
+++ b/utils/can/Makefile.am
@@ -6,24 +6,26 @@ CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
-LDFLAGS = \
- @XENO_USER_LDFLAGS@
+LDFLAGS =
rtcanconfig_SOURCES = rtcanconfig.c
rtcanconfig_LDADD = \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
rtcanrecv_SOURCES = rtcanrecv.c
rtcanrecv_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
rtcansend_SOURCES = rtcansend.c
rtcansend_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
diff --git a/utils/can/Makefile.in b/utils/can/Makefile.in
index 6136c16..e30b2fe 100644
--- a/utils/can/Makefile.in
+++ b/utils/can/Makefile.in
@@ -147,9 +147,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LATEX_BATCHMODE = @LATEX_BATCHMODE@
LATEX_MODE = @LATEX_MODE@
LD = @LD@
-LDFLAGS = \
- @XENO_USER_LDFLAGS@
-
+LDFLAGS =
LD_FILE_OPTION = @LD_FILE_OPTION@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -195,7 +193,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -255,19 +253,22 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
rtcanconfig_SOURCES = rtcanconfig.c
rtcanconfig_LDADD = \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
rtcanrecv_SOURCES = rtcanrecv.c
rtcanrecv_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
rtcansend_SOURCES = rtcansend.c
rtcansend_LDADD = \
../../lib/alchemy/libalchemy.la \
../../lib/copperplate/libcopperplate.la \
- ../../lib/cobalt/libcobalt.la
+ ../../lib/cobalt/libcobalt.la \
+ @XENO_USER_LDADD@
all: all-am
diff --git a/utils/ps/Makefile.in b/utils/ps/Makefile.in
index 643f56c..c4dcce8 100644
--- a/utils/ps/Makefile.in
+++ b/utils/ps/Makefile.in
@@ -180,7 +180,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/utils/slackspot/Makefile.in b/utils/slackspot/Makefile.in
index 26d872f..d6f060b 100644
--- a/utils/slackspot/Makefile.in
+++ b/utils/slackspot/Makefile.in
@@ -180,7 +180,7 @@ XENO_TEST_DIR = @XENO_TEST_DIR@
XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
-XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
