Module: xenomai-forge
Branch: next
Commit: e6a0e3678ec46266ba3028210c5f7222db42d577
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=e6a0e3678ec46266ba3028210c5f7222db42d577
Author: Philippe Gerum <r...@xenomai.org>
Date: Mon Aug 4 21:46:33 2014 +0200
include/trank: install for mercury
---
include/Makefile.am | 4 ++--
include/Makefile.in | 7 +++----
include/trank/Makefile.am | 7 ++++++-
include/trank/Makefile.in | 10 ++++++----
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/include/Makefile.am b/include/Makefile.am
index af13352..9e0d540 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -9,13 +9,13 @@ SUBDIRS = \
smokey \
alchemy \
psos \
+ trank \
vxworks
if XENO_COBALT
SUBDIRS += \
cobalt \
- rtdm \
- trank
+ rtdm
else
SUBDIRS += mercury
endif
diff --git a/include/Makefile.in b/include/Makefile.in
index 45c9f98..6b8bec9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -81,8 +81,7 @@ host_triplet = @host@
target_triplet = @target@
@XENO_COBALT_TRUE@am__append_1 = \
@XENO_COBALT_TRUE@ cobalt \
-@XENO_COBALT_TRUE@ rtdm \
-@XENO_COBALT_TRUE@ trank
+@XENO_COBALT_TRUE@ rtdm
@XENO_COBALT_FALSE@am__append_2 = mercury
subdir = include
@@ -379,8 +378,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
nodist_include_HEADERS = $(CONFIG_HEADER)
include_HEADERS = version.h
-SUBDIRS = nocore boilerplate copperplate smokey alchemy psos vxworks \
- $(am__append_1) $(am__append_2)
+SUBDIRS = nocore boilerplate copperplate smokey alchemy psos trank \
+ vxworks $(am__append_1) $(am__append_2)
DIST_SUBDIRS = \
alchemy \
boilerplate \
diff --git a/include/trank/Makefile.am b/include/trank/Makefile.am
index 4a20401..69721d9 100644
--- a/include/trank/Makefile.am
+++ b/include/trank/Makefile.am
@@ -1,5 +1,10 @@
includesubdir = $(includedir)/trank
-includesub_HEADERS = rtdk.h trank.h
+includesub_HEADERS = trank.h
+if XENO_COBALT
+includesub_HEADERS += rtdk.h
SUBDIRS = posix native rtdm
+endif
+
+DIST_SUBDIRS = posix native rtdm
diff --git a/include/trank/Makefile.in b/include/trank/Makefile.in
index 5db5756..07f17e4 100644
--- a/include/trank/Makefile.in
+++ b/include/trank/Makefile.in
@@ -79,9 +79,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+@XENO_COBALT_TRUE@am__append_1 = rtdk.h
subdir = include/trank
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(includesub_HEADERS)
+ $(am__includesub_HEADERS_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
$(top_srcdir)/config/libtool.m4 \
@@ -123,6 +124,7 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__includesub_HEADERS_DIST = trank.h rtdk.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -179,7 +181,6 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -372,8 +373,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
includesubdir = $(includedir)/trank
-includesub_HEADERS = rtdk.h trank.h
-SUBDIRS = posix native rtdm
+includesub_HEADERS = trank.h $(am__append_1)
+@XENO_COBALT_TRUE@SUBDIRS = posix native rtdm
+DIST_SUBDIRS = posix native rtdm
all: all-recursive
.SUFFIXES:
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
