Module: xenomai-2.6
Branch: master
Commit: ae2cb7b33434359c0b0991963b41f397abd19e17
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=ae2cb7b33434359c0b0991963b41f397abd19e17

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Wed Feb  1 21:00:45 2012 +0100

posix: use wrap-link.sh to link posix tests

Fixes the build of testsuite with static libraries.

---

 src/testsuite/regression/native+posix/Makefile.am |    2 ++
 src/testsuite/regression/native+posix/Makefile.in |    2 +-
 src/testsuite/regression/posix/Makefile.am        |    2 ++
 src/testsuite/regression/posix/Makefile.in        |    2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/testsuite/regression/native+posix/Makefile.am 
b/src/testsuite/regression/native+posix/Makefile.am
index 385bb7d..3048db9 100644
--- a/src/testsuite/regression/native+posix/Makefile.am
+++ b/src/testsuite/regression/native+posix/Makefile.am
@@ -1,5 +1,7 @@
 tstdir = @XENO_TEST_DIR@/regression/native+posix
 
+CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
+
 tst_PROGRAMS = mq_select
 
 INCLUDES = -I$(srcdir)/..
diff --git a/src/testsuite/regression/native+posix/Makefile.in 
b/src/testsuite/regression/native+posix/Makefile.in
index 1fa8794..b63bffe 100644
--- a/src/testsuite/regression/native+posix/Makefile.in
+++ b/src/testsuite/regression/native+posix/Makefile.in
@@ -71,7 +71,6 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) \
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
@@ -238,6 +237,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 tstdir = @XENO_TEST_DIR@/regression/native+posix
+CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
 INCLUDES = -I$(srcdir)/..
 LDADD = \
        ../../../skins/native/libnative.la \
diff --git a/src/testsuite/regression/posix/Makefile.am 
b/src/testsuite/regression/posix/Makefile.am
index c397afd..26bc8f2 100644
--- a/src/testsuite/regression/posix/Makefile.am
+++ b/src/testsuite/regression/posix/Makefile.am
@@ -2,6 +2,8 @@ tstdir = @XENO_TEST_DIR@/regression/posix
 
 noinst_HEADERS = check.h
 
+CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
+
 tst_PROGRAMS = leaks shm
 
 CPPFLAGS = $(XENO_USER_CFLAGS) \
diff --git a/src/testsuite/regression/posix/Makefile.in 
b/src/testsuite/regression/posix/Makefile.in
index 747a0a3..ff424e2 100644
--- a/src/testsuite/regression/posix/Makefile.in
+++ b/src/testsuite/regression/posix/Makefile.in
@@ -76,7 +76,6 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) \
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
@@ -245,6 +244,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 tstdir = @XENO_TEST_DIR@/regression/posix
 noinst_HEADERS = check.h
+CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
 LDADD = \
        ../../../skins/posix/libpthread_rt.la \
        ../../../skins/common/libxenomai.la \


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to