Module: xenomai-jki
Branch: for-upstream
Commit: a9017d966fb42be4dd467affcf0225d0b1c471cb
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=a9017d966fb42be4dd467affcf0225d0b1c471cb
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Wed Feb 1 17:07:45 2012 +0100
Add dependency of skin libraries on libxenomai
This will make sure that loading a skin library will automatically pull
in the mandatory libxenomai core library. However, we keep the output of
xeno-config untouched to enable static linking.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
src/skins/native/Makefile.am | 3 +++
src/skins/posix/Makefile.am | 3 +++
src/skins/psos+/Makefile.am | 3 +++
src/skins/rtdm/Makefile.am | 3 +++
src/skins/uitron/Makefile.am | 3 +++
src/skins/vrtx/Makefile.am | 3 +++
src/skins/vxworks/Makefile.am | 3 +++
7 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/skins/native/Makefile.am b/src/skins/native/Makefile.am
index 39eaaed..4cc8859 100644
--- a/src/skins/native/Makefile.am
+++ b/src/skins/native/Makefile.am
@@ -22,6 +22,9 @@ 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 6cbab00..c22841b 100644
--- a/src/skins/posix/Makefile.am
+++ b/src/skins/posix/Makefile.am
@@ -27,6 +27,9 @@ 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 4d876a1..ddd5c15 100644
--- a/src/skins/psos+/Makefile.am
+++ b/src/skins/psos+/Makefile.am
@@ -13,6 +13,9 @@ 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 8ad74be..2dc0a90 100644
--- a/src/skins/rtdm/Makefile.am
+++ b/src/skins/rtdm/Makefile.am
@@ -8,6 +8,9 @@ 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 52f5896..a66b51b 100644
--- a/src/skins/uitron/Makefile.am
+++ b/src/skins/uitron/Makefile.am
@@ -11,6 +11,9 @@ 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 9533cdf..0d6c2d8 100644
--- a/src/skins/vrtx/Makefile.am
+++ b/src/skins/vrtx/Makefile.am
@@ -18,6 +18,9 @@ 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 9ecef03..766bf6f 100644
--- a/src/skins/vxworks/Makefile.am
+++ b/src/skins/vxworks/Makefile.am
@@ -19,6 +19,9 @@ 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
