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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sat Jul  6 15:51:01 2013 +0200

lib/cobalt: unexport asm/xenomai/tsc.h

---

 lib/cobalt/arch/arm/Makefile.am                    |    2 +-
 lib/cobalt/arch/arm/Makefile.in                    |   12 +--
 .../arch/arm/include/asm/xenomai/Makefile.am       |   11 +-
 .../arch/arm/include/asm/xenomai/Makefile.in       |   92 ++---------
 lib/cobalt/arch/arm/include/asm/xenomai/tsc.h      |   96 +++++++++++-
 lib/cobalt/arch/arm/tsc.c                          |    4 -
 .../arch/blackfin/include/asm/xenomai/Makefile.am  |    7 +-
 .../arch/blackfin/include/asm/xenomai/Makefile.in  |   84 ++---------
 .../arch/nios2/include/asm/xenomai/Makefile.am     |    7 +-
 .../arch/nios2/include/asm/xenomai/Makefile.in     |   84 ++---------
 .../arch/powerpc/include/asm/xenomai/Makefile.am   |    8 -
 .../arch/powerpc/include/asm/xenomai/Makefile.in   |  164 +++-----------------
 lib/cobalt/arch/sh/include/asm/xenomai/Makefile.am |    7 +-
 lib/cobalt/arch/sh/include/asm/xenomai/Makefile.in |   84 ++---------
 .../arch/x86/include/asm/xenomai/Makefile.am       |    7 +-
 .../arch/x86/include/asm/xenomai/Makefile.in       |   84 ++---------
 16 files changed, 197 insertions(+), 556 deletions(-)

diff --git a/lib/cobalt/arch/arm/Makefile.am b/lib/cobalt/arch/arm/Makefile.am
index b45bfbb..0aa02d6 100644
--- a/lib/cobalt/arch/arm/Makefile.am
+++ b/lib/cobalt/arch/arm/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libarch.la
 
 libarch_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0
 
-libarch_la_SOURCES = features.c tsc.c
+libarch_la_SOURCES = features.c
 
 libarch_la_CPPFLAGS =                  \
        @XENO_COBALT_CFLAGS@            \
diff --git a/lib/cobalt/arch/arm/Makefile.in b/lib/cobalt/arch/arm/Makefile.in
index ac389f9..b2dc7ea 100644
--- a/lib/cobalt/arch/arm/Makefile.in
+++ b/lib/cobalt/arch/arm/Makefile.in
@@ -71,7 +71,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libarch_la_LIBADD =
-am_libarch_la_OBJECTS = libarch_la-features.lo libarch_la-tsc.lo
+am_libarch_la_OBJECTS = libarch_la-features.lo
 libarch_la_OBJECTS = $(am_libarch_la_OBJECTS)
 libarch_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -303,7 +303,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libarch.la
 libarch_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 0:0:0
-libarch_la_SOURCES = features.c tsc.c
+libarch_la_SOURCES = features.c
 libarch_la_CPPFLAGS = \
        @XENO_COBALT_CFLAGS@            \
        -I$(srcdir)/../..               \
@@ -366,7 +366,6 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ 
@am__quote@./$(DEPDIR)/libarch_la-features.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libarch_la-tsc.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ 
$<
@@ -396,13 +395,6 @@ libarch_la-features.lo: features.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libarch_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarch_la-features.lo `test -f 'features.c' || echo '$(srcdir)/'`features.c
 
-libarch_la-tsc.lo: tsc.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libarch_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarch_la-tsc.lo 
-MD -MP -MF $(DEPDIR)/libarch_la-tsc.Tpo -c -o libarch_la-tsc.lo `test -f 
'tsc.c' || echo '$(srcdir)/'`tsc.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libarch_la-tsc.Tpo 
$(DEPDIR)/libarch_la-tsc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='tsc.c' 
object='libarch_la-tsc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libarch_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarch_la-tsc.lo `test -f 'tsc.c' || echo '$(srcdir)/'`tsc.c
-
 mostlyclean-libtool:
        -rm -f *.lo
 
diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.am 
b/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.am
index 8f7d65d..d308b06 100644
--- a/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.am
+++ b/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.am
@@ -1,12 +1,5 @@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-
-includesub_HEADERS =   \
-       tsc.h
 
 noinst_HEADERS =       \
        features.h      \
-       syscall.h
-
-install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(includesubdir)/uapi
-       $(INSTALL_HEADER) 
$(top_srcdir)/kernel/cobalt/arch/arm/include/asm/xenomai/uapi/tsc.h 
$(DESTDIR)$(includesubdir)/uapi/tsc.h
+       syscall.h       \
+       tsc.h
diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.in 
b/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.in
index b406823..447acda 100644
--- a/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.in
+++ b/lib/cobalt/arch/arm/include/asm/xenomai/Makefile.in
@@ -52,8 +52,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib/cobalt/arch/arm/include/asm/xenomai
-DIST_COMMON = $(includesub_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -76,35 +76,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includesubdir)"
-HEADERS = $(includesub_HEADERS) $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,13 +244,10 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-includesub_HEADERS = \
-       tsc.h
-
 noinst_HEADERS = \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
 
 all: all-am
 
@@ -319,27 +288,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-includesubHEADERS: $(includesub_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
-       done
-
-uninstall-includesubHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -441,9 +389,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -494,7 +439,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -538,7 +483,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -546,20 +491,15 @@ uninstall-am: uninstall-includesubHEADERS
        clean-libtool cscopelist ctags distclean distclean-generic \
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
-       install-data-am install-data-local install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-includesubHEADERS install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags uninstall uninstall-am \
-       uninstall-includesubHEADERS
-
-
-install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(includesubdir)/uapi
-       $(INSTALL_HEADER) 
$(top_srcdir)/kernel/cobalt/arch/arm/include/asm/xenomai/uapi/tsc.h 
$(DESTDIR)$(includesubdir)/uapi/tsc.h
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/tsc.h 
b/lib/cobalt/arch/arm/include/asm/xenomai/tsc.h
index 9910833..39e3997 100644
--- a/lib/cobalt/arch/arm/include/asm/xenomai/tsc.h
+++ b/lib/cobalt/arch/arm/include/asm/xenomai/tsc.h
@@ -1,5 +1,12 @@
 /*
- * Copyright (C) 2011 Gilles Chanteperdrix <g...@xenomai.org>.
+ * Copyright (C) 2001,2002,2003,2004 Philippe Gerum <r...@xenomai.org>.
+ * Copyright (C) 2013 Gilles Chanteperdrix <g...@xenomai.org>.
+ *
+ * ARM port
+ *   Copyright (C) 2005 Stelian Pop
+ *
+ * Copyright (C) 2007 Sebastian Smolorz <se...@gmx.net>
+ *     Support for TSC emulation in user space for decrementing counters
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -10,6 +17,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
@@ -18,6 +26,11 @@
 #define _LIB_COBALT_ARM_TSC_H
 
 #include <asm/xenomai/uapi/tsc.h>
+#include <asm/xenomai/features.h>
+
+#ifndef CONFIG_XENO_ARM_TSC_TYPE
+#error "no TSC type defined for ARM platform"
+#endif
 
 /*
  * Putting kuser_tsc_get and kinfo.counter in the same struct results
@@ -28,9 +41,86 @@ struct __xn_full_tscinfo {
        struct __xn_tscinfo kinfo;
        __xn_rdtsc_t *kuser_tsc_get;
 };
-
 extern struct __xn_full_tscinfo __xn_tscinfo;
 
-unsigned long long __xn_rdtsc(void);
+static inline unsigned long long __xn_rdtsc(void)
+{
+#if CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_KUSER
+       return __xn_tscinfo.kuser_tsc_get(__xn_tscinfo.kinfo.counter);
+
+#elif CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING
+       volatile unsigned long long *const tscp = __xn_tscinfo.kinfo.tsc;
+       volatile unsigned int *const counterp = __xn_tscinfo.kinfo.counter;
+       const unsigned int mask = __xn_tscinfo.kinfo.mask;
+       register unsigned long long result;
+       unsigned int counter;
+
+       __asm__ ("ldmia %1, %M0\n": "=r"(result): "r"(tscp), "m"(*tscp));
+       __asm__ __volatile__ ("" : /* */ : /* */ : "memory");
+       counter = *counterp;
+
+       if ((counter & mask) < ((unsigned) result & mask))
+               result += mask + 1ULL;
+       return (result & ~((unsigned long long) mask)) | (counter & mask);
+
+#elif CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_COUNTDOWN
+       volatile unsigned long long *const tscp = __xn_tscinfo.kinfo.tsc;
+       volatile unsigned int *const counterp = __xn_tscinfo.kinfo.counter;
+       const unsigned int mask = __xn_tscinfo.kinfo.mask;
+       register unsigned long long result;
+       unsigned int counter;
+
+       __asm__ ("ldmia %1, %M0\n": "=r"(result): "r"(tscp), "m"(*tscp));
+       __asm__ __volatile__ ("" : /* */ : /* */ : "memory");
+       counter = mask - *counterp;
+
+       if ((counter & mask) > ((unsigned) result & mask))
+               result += mask + 1ULL;
+       return (result & ~((unsigned long long) mask)) | (counter & mask);
+
+#elif CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_FAST_WRAP
+       volatile unsigned long long *const tscp = __xn_tscinfo.kinfo.tsc;
+       volatile unsigned int *const counterp = __xn_tscinfo.kinfo.counter;
+       const unsigned int mask = __xn_tscinfo.kinfo.mask;
+       register unsigned long long after, before;
+       unsigned int counter;
+
+       __asm__ ("ldmia %1, %M0\n": "=r"(after): "r"(tscp), "m"(*tscp));
+       do {
+               before = after;
+               counter = *counterp;
+               __asm__ __volatile__ ("" : /* */ : /* */ : "memory");
+               __asm__ ("ldmia %1, %M0\n" : "=r"(after): "r"(tscp), 
"m"(*tscp));
+       } while (((unsigned) after) != ((unsigned) before));
+       if ((counter & mask) < ((unsigned) before & mask))
+               before += mask + 1;
+       return (before & ~((unsigned long long) mask)) | (counter & mask);
+
+#elif CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_DECREMENTER
+       volatile unsigned long long *const tscp = __xn_tscinfo.kinfo.tsc;
+       volatile unsigned int *const counterp = __xn_tscinfo.kinfo.counter;
+       volatile unsigned int *const last_cntp = __xn_tscinfo.kinfo.last_cnt;
+       const unsigned int mask = __xn_tscinfo.kinfo.mask;
+       register unsigned long long after, before;
+       unsigned int counter, last_cnt;
+
+       __asm__ ("ldmia %1, %M0\n": "=r"(after): "r"(tscp), "m"(*tscp));
+       do {
+               before = after;
+               counter = *counterp;
+               last_cnt = *last_cntp;
+               /* compiler barrier. */
+               __asm__ __volatile__ ("" : /* */ : /* */ : "memory");
+               __asm__ ("ldmia %1, %M0\n": "=r"(after): "r"(tscp), "m"(*tscp));
+       } while (after != before);
+
+       counter &= mask;
+       last_cnt &= mask;
+       if (counter > last_cnt)
+               before += mask + 1ULL;
+       return (before + last_cnt - counter);
+
+#endif /* CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_DECREMENTER */
+}
 
 #endif /* !_LIB_COBALT_ARM_TSC_H */
diff --git a/lib/cobalt/arch/arm/tsc.c b/lib/cobalt/arch/arm/tsc.c
index e612647..702487b 100644
--- a/lib/cobalt/arch/arm/tsc.c
+++ b/lib/cobalt/arch/arm/tsc.c
@@ -25,10 +25,6 @@
 #include <asm/xenomai/tsc.h>
 #include <asm/xenomai/features.h>
 
-#ifndef CONFIG_XENO_ARM_TSC_TYPE
-#error "no TSC type defined for ARM platform"
-#endif
-
 unsigned long long __xn_rdtsc(void)
 {
 #if CONFIG_XENO_ARM_TSC_TYPE == __XN_TSC_TYPE_KUSER
diff --git a/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.am 
b/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.am
index 9b934bd..d308b06 100644
--- a/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.am
+++ b/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.am
@@ -1,8 +1,5 @@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-
-includesub_HEADERS =   \
-       tsc.h
 
 noinst_HEADERS =       \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
diff --git a/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.in 
b/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.in
index c14028f..5c22120 100644
--- a/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.in
+++ b/lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile.in
@@ -52,8 +52,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib/cobalt/arch/blackfin/include/asm/xenomai
-DIST_COMMON = $(includesub_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -76,35 +76,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includesubdir)"
-HEADERS = $(includesub_HEADERS) $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,13 +244,10 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-includesub_HEADERS = \
-       tsc.h
-
 noinst_HEADERS = \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
 
 all: all-am
 
@@ -319,27 +288,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-includesubHEADERS: $(includesub_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
-       done
-
-uninstall-includesubHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -441,9 +389,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -494,7 +439,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -538,7 +483,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -547,14 +492,13 @@ uninstall-am: uninstall-includesubHEADERS
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-includesubHEADERS install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags uninstall uninstall-am \
-       uninstall-includesubHEADERS
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.am 
b/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.am
index 9b934bd..d308b06 100644
--- a/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.am
+++ b/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.am
@@ -1,8 +1,5 @@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-
-includesub_HEADERS =   \
-       tsc.h
 
 noinst_HEADERS =       \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
diff --git a/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.in 
b/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.in
index 3a506b2..0eb9764 100644
--- a/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.in
+++ b/lib/cobalt/arch/nios2/include/asm/xenomai/Makefile.in
@@ -52,8 +52,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib/cobalt/arch/nios2/include/asm/xenomai
-DIST_COMMON = $(includesub_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -76,35 +76,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includesubdir)"
-HEADERS = $(includesub_HEADERS) $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,13 +244,10 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-includesub_HEADERS = \
-       tsc.h
-
 noinst_HEADERS = \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
 
 all: all-am
 
@@ -319,27 +288,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-includesubHEADERS: $(includesub_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
-       done
-
-uninstall-includesubHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -441,9 +389,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -494,7 +439,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -538,7 +483,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -547,14 +492,13 @@ uninstall-am: uninstall-includesubHEADERS
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-includesubHEADERS install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags uninstall uninstall-am \
-       uninstall-includesubHEADERS
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.am 
b/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.am
index 9b934bd..e69de29 100644
--- a/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.am
+++ b/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.am
@@ -1,8 +0,0 @@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-
-includesub_HEADERS =   \
-       tsc.h
-
-noinst_HEADERS =       \
-       features.h      \
-       syscall.h
diff --git a/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.in 
b/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.in
index db66694..2ec9fbe 100644
--- a/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.in
+++ b/lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -52,8 +51,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib/cobalt/arch/powerpc/include/asm/xenomai
-DIST_COMMON = $(includesub_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -76,37 +74,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includesubdir)"
-HEADERS = $(includesub_HEADERS) $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 A2X = @A2X@
 ACLOCAL = @ACLOCAL@
@@ -272,14 +239,6 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-includesub_HEADERS = \
-       tsc.h
-
-noinst_HEADERS = \
-       features.h      \
-       syscall.h
-
 all: all-am
 
 .SUFFIXES:
@@ -319,93 +278,14 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-includesubHEADERS: $(includesub_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
-       done
-
-uninstall-includesubHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
 tags: TAGS
+TAGS:
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-       list='$(SOURCES) $(HEADERS) $(LISP)'; \
-       case "$(srcdir)" in \
-         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-         *) sdir=$(subdir)/$(srcdir) ;; \
-       esac; \
-       for i in $$list; do \
-         if test -f "$$i"; then \
-           echo "$(subdir)/$$i"; \
-         else \
-           echo "$$sdir/$$i"; \
-         fi; \
-       done >> $(top_builddir)/cscope.files
+CTAGS:
+
+cscope cscopelist:
 
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -439,11 +319,8 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
 check: check-am
-all-am: Makefile $(HEADERS)
+all-am: Makefile
 installdirs:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -480,7 +357,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -494,7 +371,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -538,23 +415,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libtool cscopelist ctags distclean distclean-generic \
-       distclean-libtool distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-includesubHEADERS install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags uninstall uninstall-am \
-       uninstall-includesubHEADERS
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.am 
b/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.am
index 9b934bd..d308b06 100644
--- a/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.am
+++ b/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.am
@@ -1,8 +1,5 @@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-
-includesub_HEADERS =   \
-       tsc.h
 
 noinst_HEADERS =       \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
diff --git a/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.in 
b/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.in
index ad8dca7..7da4163 100644
--- a/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.in
+++ b/lib/cobalt/arch/sh/include/asm/xenomai/Makefile.in
@@ -52,8 +52,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib/cobalt/arch/sh/include/asm/xenomai
-DIST_COMMON = $(includesub_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -76,35 +76,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includesubdir)"
-HEADERS = $(includesub_HEADERS) $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,13 +244,10 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-includesub_HEADERS = \
-       tsc.h
-
 noinst_HEADERS = \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
 
 all: all-am
 
@@ -319,27 +288,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-includesubHEADERS: $(includesub_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
-       done
-
-uninstall-includesubHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -441,9 +389,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -494,7 +439,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -538,7 +483,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -547,14 +492,13 @@ uninstall-am: uninstall-includesubHEADERS
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-includesubHEADERS install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags uninstall uninstall-am \
-       uninstall-includesubHEADERS
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.am 
b/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.am
index 9b934bd..d308b06 100644
--- a/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.am
+++ b/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.am
@@ -1,8 +1,5 @@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-
-includesub_HEADERS =   \
-       tsc.h
 
 noinst_HEADERS =       \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
diff --git a/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.in 
b/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.in
index c9c8e89..e1816bc 100644
--- a/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.in
+++ b/lib/cobalt/arch/x86/include/asm/xenomai/Makefile.in
@@ -52,8 +52,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = lib/cobalt/arch/x86/include/asm/xenomai
-DIST_COMMON = $(includesub_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
        $(top_srcdir)/config/docbook.m4 \
@@ -76,35 +76,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includesubdir)"
-HEADERS = $(includesub_HEADERS) $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,13 +244,10 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/cobalt/asm/xenomai
-includesub_HEADERS = \
-       tsc.h
-
 noinst_HEADERS = \
        features.h      \
-       syscall.h
+       syscall.h       \
+       tsc.h
 
 all: all-am
 
@@ -319,27 +288,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-includesubHEADERS: $(includesub_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
-       done
-
-uninstall-includesubHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -441,9 +389,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -494,7 +439,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -538,7 +483,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -547,14 +492,13 @@ uninstall-am: uninstall-includesubHEADERS
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-includesubHEADERS install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am tags uninstall uninstall-am \
-       uninstall-includesubHEADERS
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.


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

Reply via email to