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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sun Jun  7 18:18:21 2015 +0200

include: move version.h to xenomai/ subdir

---

 include/Makefile.am              |    2 --
 include/xenomai/Makefile.am      |    4 ++--
 include/{ => xenomai}/version.h  |    0
 lib/copperplate/regd/fs-common.c |    2 +-
 scripts/prepare-kernel.sh        |    2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index a84e728..f1b5738 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,5 @@
 nodist_include_HEADERS=$(CONFIG_HEADER)
 
-include_HEADERS = version.h
-
 SUBDIRS =              \
        boilerplate     \
        copperplate     \
diff --git a/include/xenomai/Makefile.am b/include/xenomai/Makefile.am
index 871cf2b..f4d0c16 100644
--- a/include/xenomai/Makefile.am
+++ b/include/xenomai/Makefile.am
@@ -2,5 +2,5 @@ includesubdir = $(includedir)/xenomai
 
 includesub_HEADERS =   \
        init.h          \
-       tunables.h
-
+       tunables.h      \
+       version.h
diff --git a/include/version.h b/include/xenomai/version.h
similarity index 100%
rename from include/version.h
rename to include/xenomai/version.h
diff --git a/lib/copperplate/regd/fs-common.c b/lib/copperplate/regd/fs-common.c
index 1276b63..99a2120 100644
--- a/lib/copperplate/regd/fs-common.c
+++ b/lib/copperplate/regd/fs-common.c
@@ -23,11 +23,11 @@
 #include <stdio.h>
 #include <signal.h>
 #include <malloc.h>
-#include <version.h>
 #include <sched.h>
 #include <copperplate/heapobj.h>
 #include <copperplate/threadobj.h>
 #include <copperplate/clockobj.h>
+#include <xenomai/version.h>
 #include "sysregfs.h"
 #include "../internal.h"
 
diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 2d4fb99..dbc5d24 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -447,7 +447,7 @@ patch_link n n include/cobalt/kernel 
include/xenomai/cobalt/kernel
 patch_link r n include/cobalt/kernel/rtdm include/xenomai/rtdm
 patch_link r n include/cobalt/uapi include/xenomai/cobalt/uapi
 patch_link r n include/rtdm/uapi include/xenomai/rtdm/uapi
-patch_link n version.h include include/xenomai
+patch_link n version.h include/xenomai include/xenomai
 
 if test "x$output_patch" != "x"; then
     if test x$verbose = x1; then


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to