Module: xenomai-2.6
Branch: master
Commit: 66b0b726d239920c85c93f286242df345ce6e529
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=66b0b726d239920c85c93f286242df345ce6e529
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Tue Feb 7 17:06:51 2012 +0100
Revert 7c601b91f218d05bf6c243469cc21c97ae2d237c
It causes build failure when cross-compiling.
---
configure | 8 ++++----
src/skins/native/Makefile.am | 3 ---
src/skins/native/Makefile.in | 5 +----
src/skins/posix/Makefile.am | 3 ---
src/skins/posix/Makefile.in | 5 +----
src/skins/psos+/Makefile.am | 3 ---
src/skins/psos+/Makefile.in | 5 +----
src/skins/rtdm/Makefile.am | 3 ---
src/skins/rtdm/Makefile.in | 5 +----
src/skins/uitron/Makefile.am | 3 ---
src/skins/uitron/Makefile.in | 5 +----
src/skins/vrtx/Makefile.am | 3 ---
src/skins/vrtx/Makefile.in | 5 +----
src/skins/vxworks/Makefile.am | 3 ---
src/skins/vxworks/Makefile.in | 5 +----
15 files changed, 11 insertions(+), 53 deletions(-)
diff --git a/configure b/configure
index b38e32c..8085c98 100755
--- a/configure
+++ b/configure
@@ -12444,11 +12444,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
$as_echo "done" >&6; }
-XENO_USER_CFLAGS="-D_GNU_SOURCE -D_REENTRANT -Wall
-Werror-implicit-function-declaration -pipe"
-XENO_USER_LDFLAGS=
+XENO_USER_APP_CFLAGS="-D_GNU_SOURCE -D_REENTRANT"
+XENO_USER_APP_LDFLAGS=
-XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
-XENO_USER_APP_LDFLAGS=$XENO_USER_LDFLAGS
+XENO_USER_CFLAGS="$XENO_USER_CFLAGS -Wall
-Werror-implicit-function-declaration -pipe"
+XENO_USER_LDFLAGS="$XENO_USER_APP_LDFLAGS"
case $XENO_TARGET_ARCH in
x86)
diff --git a/src/skins/native/Makefile.am b/src/skins/native/Makefile.am
index 4cc8859..39eaaed 100644
--- a/src/skins/native/Makefile.am
+++ b/src/skins/native/Makefile.am
@@ -22,9 +22,6 @@ libnative_la_SOURCES = \
wrappers.c \
wrappers.h
-libnative_la_LIBADD = \
- ../common/libxenomai.la
-
libnative_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/native/Makefile.in b/src/skins/native/Makefile.in
index e276edb..8779477 100644
--- a/src/skins/native/Makefile.in
+++ b/src/skins/native/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libnative_la_DEPENDENCIES = ../common/libxenomai.la
+libnative_la_LIBADD =
am_libnative_la_OBJECTS = libnative_la-alarm.lo libnative_la-buffer.lo \
libnative_la-cond.lo libnative_la-event.lo \
libnative_la-heap.lo libnative_la-init.lo libnative_la-intr.lo \
@@ -284,9 +284,6 @@ libnative_la_SOURCES = \
wrappers.c \
wrappers.h
-libnative_la_LIBADD = \
- ../common/libxenomai.la
-
libnative_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/posix/Makefile.am b/src/skins/posix/Makefile.am
index c22841b..6cbab00 100644
--- a/src/skins/posix/Makefile.am
+++ b/src/skins/posix/Makefile.am
@@ -27,9 +27,6 @@ libpthread_rt_la_SOURCES = \
printf.c \
wrappers.c
-libpthread_rt_la_LIBADD = \
- ../common/libxenomai.la
-
libpthread_rt_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include \
diff --git a/src/skins/posix/Makefile.in b/src/skins/posix/Makefile.in
index fb2ad3b..6427e62 100644
--- a/src/skins/posix/Makefile.in
+++ b/src/skins/posix/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libpthread_rt_la_DEPENDENCIES = ../common/libxenomai.la
+libpthread_rt_la_LIBADD =
am_libpthread_rt_la_OBJECTS = libpthread_rt_la-init.lo \
libpthread_rt_la-thread.lo libpthread_rt_la-timer.lo \
libpthread_rt_la-semaphore.lo libpthread_rt_la-clock.lo \
@@ -283,9 +283,6 @@ libpthread_rt_la_SOURCES = \
printf.c \
wrappers.c
-libpthread_rt_la_LIBADD = \
- ../common/libxenomai.la
-
libpthread_rt_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include \
diff --git a/src/skins/psos+/Makefile.am b/src/skins/psos+/Makefile.am
index ddd5c15..4d876a1 100644
--- a/src/skins/psos+/Makefile.am
+++ b/src/skins/psos+/Makefile.am
@@ -13,9 +13,6 @@ libpsos_la_SOURCES = \
task.c \
tm.c
-libpsos_la_LIBADD = \
- ../common/libxenomai.la
-
libpsos_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/psos+/Makefile.in b/src/skins/psos+/Makefile.in
index 09643b7..9f2bf58 100644
--- a/src/skins/psos+/Makefile.in
+++ b/src/skins/psos+/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libpsos_la_DEPENDENCIES = ../common/libxenomai.la
+libpsos_la_LIBADD =
am_libpsos_la_OBJECTS = libpsos_la-asr.lo libpsos_la-init.lo \
libpsos_la-queue.lo libpsos_la-rn.lo libpsos_la-sem.lo \
libpsos_la-task.lo libpsos_la-tm.lo
@@ -271,9 +271,6 @@ libpsos_la_SOURCES = \
task.c \
tm.c
-libpsos_la_LIBADD = \
- ../common/libxenomai.la
-
libpsos_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/rtdm/Makefile.am b/src/skins/rtdm/Makefile.am
index 2dc0a90..8ad74be 100644
--- a/src/skins/rtdm/Makefile.am
+++ b/src/skins/rtdm/Makefile.am
@@ -8,9 +8,6 @@ librtdm_la_SOURCES = \
core.c \
init.c
-librtdm_la_LIBADD = \
- ../common/libxenomai.la
-
librtdm_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/rtdm/Makefile.in b/src/skins/rtdm/Makefile.in
index e649b68..80c52b2 100644
--- a/src/skins/rtdm/Makefile.in
+++ b/src/skins/rtdm/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-librtdm_la_DEPENDENCIES = ../common/libxenomai.la
+librtdm_la_LIBADD =
am_librtdm_la_OBJECTS = librtdm_la-core.lo librtdm_la-init.lo
librtdm_la_OBJECTS = $(am_librtdm_la_OBJECTS)
librtdm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -264,9 +264,6 @@ librtdm_la_SOURCES = \
core.c \
init.c
-librtdm_la_LIBADD = \
- ../common/libxenomai.la
-
librtdm_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/uitron/Makefile.am b/src/skins/uitron/Makefile.am
index a66b51b..52f5896 100644
--- a/src/skins/uitron/Makefile.am
+++ b/src/skins/uitron/Makefile.am
@@ -11,9 +11,6 @@ libuitron_la_SOURCES = \
sem.c \
task.c
-libuitron_la_LIBADD = \
- ../common/libxenomai.la
-
libuitron_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/uitron/Makefile.in b/src/skins/uitron/Makefile.in
index 2e45dbd..00b8aae 100644
--- a/src/skins/uitron/Makefile.in
+++ b/src/skins/uitron/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libuitron_la_DEPENDENCIES = ../common/libxenomai.la
+libuitron_la_LIBADD =
am_libuitron_la_OBJECTS = libuitron_la-flag.lo libuitron_la-init.lo \
libuitron_la-mbx.lo libuitron_la-sem.lo libuitron_la-task.lo
libuitron_la_OBJECTS = $(am_libuitron_la_OBJECTS)
@@ -268,9 +268,6 @@ libuitron_la_SOURCES = \
sem.c \
task.c
-libuitron_la_LIBADD = \
- ../common/libxenomai.la
-
libuitron_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/vrtx/Makefile.am b/src/skins/vrtx/Makefile.am
index 0d6c2d8..9533cdf 100644
--- a/src/skins/vrtx/Makefile.am
+++ b/src/skins/vrtx/Makefile.am
@@ -18,9 +18,6 @@ libvrtx_la_SOURCES = \
wrappers.c \
wrappers.h
-libvrtx_la_LIBADD = \
- ../common/libxenomai.la
-
libvrtx_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/vrtx/Makefile.in b/src/skins/vrtx/Makefile.in
index 95b8d14..85d3cae 100644
--- a/src/skins/vrtx/Makefile.in
+++ b/src/skins/vrtx/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libvrtx_la_DEPENDENCIES = ../common/libxenomai.la
+libvrtx_la_LIBADD =
am_libvrtx_la_OBJECTS = libvrtx_la-event.lo libvrtx_la-heap.lo \
libvrtx_la-init.lo libvrtx_la-mb.lo libvrtx_la-mx.lo \
libvrtx_la-pt.lo libvrtx_la-queue.lo libvrtx_la-sem.lo \
@@ -277,9 +277,6 @@ libvrtx_la_SOURCES = \
wrappers.c \
wrappers.h
-libvrtx_la_LIBADD = \
- ../common/libxenomai.la
-
libvrtx_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/vxworks/Makefile.am b/src/skins/vxworks/Makefile.am
index 766bf6f..9ecef03 100644
--- a/src/skins/vxworks/Makefile.am
+++ b/src/skins/vxworks/Makefile.am
@@ -19,9 +19,6 @@ libvxworks_la_SOURCES = \
wrappers.c \
wrappers.h
-libvxworks_la_LIBADD = \
- ../common/libxenomai.la
-
libvxworks_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
diff --git a/src/skins/vxworks/Makefile.in b/src/skins/vxworks/Makefile.in
index d8f6623..5badaa5 100644
--- a/src/skins/vxworks/Makefile.in
+++ b/src/skins/vxworks/Makefile.in
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libvxworks_la_DEPENDENCIES = ../common/libxenomai.la
+libvxworks_la_LIBADD =
am_libvxworks_la_OBJECTS = libvxworks_la-errnoLib.lo \
libvxworks_la-intLib.lo libvxworks_la-msgQLib.lo \
libvxworks_la-kernelLib.lo libvxworks_la-semLib.lo \
@@ -281,9 +281,6 @@ libvxworks_la_SOURCES = \
wrappers.c \
wrappers.h
-libvxworks_la_LIBADD = \
- ../common/libxenomai.la
-
libvxworks_la_CPPFLAGS = \
@XENO_USER_CFLAGS@ \
-I$(top_srcdir)/include
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
