Module: xenomai-forge
Branch: next
Commit: 9fcfbb0252ea0b56debe059ec305c0a377f515ca
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=9fcfbb0252ea0b56debe059ec305c0a377f515ca

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu Jul  4 12:04:24 2013 +0200

include/cobalt: do not export kernel-only headers

---

 include/cobalt/asm-arm/Makefile.am           |    3 +-
 include/cobalt/asm-arm/Makefile.in           |   76 ++++---------------------
 include/cobalt/asm-blackfin/Makefile.am      |    3 +-
 include/cobalt/asm-blackfin/Makefile.in      |   76 ++++---------------------
 include/cobalt/asm-generic/Makefile.am       |    3 +-
 include/cobalt/asm-generic/Makefile.in       |   76 ++++---------------------
 include/cobalt/asm-generic/ipipe/Makefile.am |    3 +-
 include/cobalt/asm-generic/ipipe/Makefile.in |   78 ++++----------------------
 include/cobalt/asm-nios2/Makefile.am         |    3 +-
 include/cobalt/asm-nios2/Makefile.in         |   78 ++++----------------------
 include/cobalt/asm-powerpc/Makefile.am       |    3 +-
 include/cobalt/asm-powerpc/Makefile.in       |   76 ++++---------------------
 include/cobalt/asm-powerpc/uapi/Makefile.am  |    3 +-
 include/cobalt/asm-powerpc/uapi/Makefile.in  |    3 +-
 include/cobalt/asm-sh/Makefile.am            |    3 +-
 include/cobalt/asm-sh/Makefile.in            |   76 ++++---------------------
 include/cobalt/asm-x86/Makefile.am           |    3 +-
 include/cobalt/asm-x86/Makefile.in           |   76 ++++---------------------
 18 files changed, 100 insertions(+), 542 deletions(-)

diff --git a/include/cobalt/asm-arm/Makefile.am 
b/include/cobalt/asm-arm/Makefile.am
index 2635e3c..d0cb931 100644
--- a/include/cobalt/asm-arm/Makefile.am
+++ b/include/cobalt/asm-arm/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-arm
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        calibration.h   \
        features.h      \
        fptest.h        \
diff --git a/include/cobalt/asm-arm/Makefile.in 
b/include/cobalt/asm-arm/Makefile.in
index 7377a2a..09a03e5 100644
--- a/include/cobalt/asm-arm/Makefile.in
+++ b/include/cobalt/asm-arm/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-arm
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -83,35 +83,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)
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -310,8 +282,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-arm
-includesub_HEADERS = \
+noinst_HEADERS = \
        calibration.h   \
        features.h      \
        fptest.h        \
@@ -360,27 +331,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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -568,9 +518,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -621,7 +568,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -665,7 +612,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
        cscopelist-recursive ctags-recursive install-am install-strip \
@@ -678,13 +625,12 @@ uninstall-am: uninstall-includesubHEADERS
        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 installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includesubHEADERS
+       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 \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/include/cobalt/asm-blackfin/Makefile.am 
b/include/cobalt/asm-blackfin/Makefile.am
index d0003a5..d0cb931 100644
--- a/include/cobalt/asm-blackfin/Makefile.am
+++ b/include/cobalt/asm-blackfin/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-blackfin
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        calibration.h   \
        features.h      \
        fptest.h        \
diff --git a/include/cobalt/asm-blackfin/Makefile.in 
b/include/cobalt/asm-blackfin/Makefile.in
index 2d3b54d..947dd22 100644
--- a/include/cobalt/asm-blackfin/Makefile.in
+++ b/include/cobalt/asm-blackfin/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-blackfin
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -83,35 +83,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)
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -310,8 +282,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-blackfin
-includesub_HEADERS = \
+noinst_HEADERS = \
        calibration.h   \
        features.h      \
        fptest.h        \
@@ -360,27 +331,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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -568,9 +518,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -621,7 +568,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -665,7 +612,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
        cscopelist-recursive ctags-recursive install-am install-strip \
@@ -678,13 +625,12 @@ uninstall-am: uninstall-includesubHEADERS
        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 installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includesubHEADERS
+       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 \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/include/cobalt/asm-generic/Makefile.am 
b/include/cobalt/asm-generic/Makefile.am
index 913c7a7..b7e4cc2 100644
--- a/include/cobalt/asm-generic/Makefile.am
+++ b/include/cobalt/asm-generic/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-generic
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        machine.h       \
        mayday.h        \
        pci_ids.h       \
diff --git a/include/cobalt/asm-generic/Makefile.in 
b/include/cobalt/asm-generic/Makefile.in
index 5ec533d..3c7a058 100644
--- a/include/cobalt/asm-generic/Makefile.in
+++ b/include/cobalt/asm-generic/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-generic
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -83,35 +83,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)
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -310,8 +282,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-generic
-includesub_HEADERS = \
+noinst_HEADERS = \
        machine.h       \
        mayday.h        \
        pci_ids.h       \
@@ -359,27 +330,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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -567,9 +517,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -620,7 +567,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -664,7 +611,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
        cscopelist-recursive ctags-recursive install-am install-strip \
@@ -677,13 +624,12 @@ uninstall-am: uninstall-includesubHEADERS
        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 installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includesubHEADERS
+       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 \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/include/cobalt/asm-generic/ipipe/Makefile.am 
b/include/cobalt/asm-generic/ipipe/Makefile.am
index e15c7bf..6e23767 100644
--- a/include/cobalt/asm-generic/ipipe/Makefile.am
+++ b/include/cobalt/asm-generic/ipipe/Makefile.am
@@ -1,4 +1,3 @@
-includesubdir = $(includedir)/asm-generic/ipipe
 
-includesub_HEADERS = \
+noinst_HEADERS = \
        thread_info.h
diff --git a/include/cobalt/asm-generic/ipipe/Makefile.in 
b/include/cobalt/asm-generic/ipipe/Makefile.in
index 0afe661..e90b45f 100644
--- a/include/cobalt/asm-generic/ipipe/Makefile.in
+++ b/include/cobalt/asm-generic/ipipe/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-generic/ipipe
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -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)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,8 +244,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-generic/ipipe
-includesub_HEADERS = \
+noinst_HEADERS = \
        thread_info.h
 
 all: all-am
@@ -315,27 +286,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)'; \
@@ -437,9 +387,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
@@ -490,7 +437,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -534,7 +481,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -543,14 +490,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/include/cobalt/asm-nios2/Makefile.am 
b/include/cobalt/asm-nios2/Makefile.am
index 87e8947..2630158 100644
--- a/include/cobalt/asm-nios2/Makefile.am
+++ b/include/cobalt/asm-nios2/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-nios2
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        calibration.h   \
        features.h      \
        fptest.h        \
diff --git a/include/cobalt/asm-nios2/Makefile.in 
b/include/cobalt/asm-nios2/Makefile.in
index d104c22..f7874d1 100644
--- a/include/cobalt/asm-nios2/Makefile.in
+++ b/include/cobalt/asm-nios2/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-nios2
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -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)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -272,8 +244,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-nios2
-includesub_HEADERS = \
+noinst_HEADERS = \
        calibration.h   \
        features.h      \
        fptest.h        \
@@ -321,27 +292,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)'; \
@@ -443,9 +393,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
@@ -496,7 +443,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -540,7 +487,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: install-am install-strip
 
@@ -549,14 +496,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/include/cobalt/asm-powerpc/Makefile.am 
b/include/cobalt/asm-powerpc/Makefile.am
index 07cbf02..d0cb931 100644
--- a/include/cobalt/asm-powerpc/Makefile.am
+++ b/include/cobalt/asm-powerpc/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-powerpc
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        calibration.h   \
        features.h      \
        fptest.h        \
diff --git a/include/cobalt/asm-powerpc/Makefile.in 
b/include/cobalt/asm-powerpc/Makefile.in
index 4cd697d..2a16871 100644
--- a/include/cobalt/asm-powerpc/Makefile.in
+++ b/include/cobalt/asm-powerpc/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-powerpc
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -83,35 +83,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)
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -310,8 +282,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-powerpc
-includesub_HEADERS = \
+noinst_HEADERS = \
        calibration.h   \
        features.h      \
        fptest.h        \
@@ -360,27 +331,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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -568,9 +518,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -621,7 +568,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -665,7 +612,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
        cscopelist-recursive ctags-recursive install-am install-strip \
@@ -678,13 +625,12 @@ uninstall-am: uninstall-includesubHEADERS
        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 installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includesubHEADERS
+       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 \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/include/cobalt/asm-powerpc/uapi/Makefile.am 
b/include/cobalt/asm-powerpc/uapi/Makefile.am
index 788d155..3856607 100644
--- a/include/cobalt/asm-powerpc/uapi/Makefile.am
+++ b/include/cobalt/asm-powerpc/uapi/Makefile.am
@@ -3,5 +3,4 @@ includesubdir = $(includedir)/asm-powerpc/uapi
 includesub_HEADERS =   \
        arith.h         \
        features.h      \
-       syscall.h       \
-       features.h
+       syscall.h
diff --git a/include/cobalt/asm-powerpc/uapi/Makefile.in 
b/include/cobalt/asm-powerpc/uapi/Makefile.in
index 860c0dc..f89ad75 100644
--- a/include/cobalt/asm-powerpc/uapi/Makefile.in
+++ b/include/cobalt/asm-powerpc/uapi/Makefile.in
@@ -276,8 +276,7 @@ includesubdir = $(includedir)/asm-powerpc/uapi
 includesub_HEADERS = \
        arith.h         \
        features.h      \
-       syscall.h       \
-       features.h
+       syscall.h
 
 all: all-am
 
diff --git a/include/cobalt/asm-sh/Makefile.am 
b/include/cobalt/asm-sh/Makefile.am
index 4b0dc3e..d0cb931 100644
--- a/include/cobalt/asm-sh/Makefile.am
+++ b/include/cobalt/asm-sh/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-sh
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        calibration.h   \
        features.h      \
        fptest.h        \
diff --git a/include/cobalt/asm-sh/Makefile.in 
b/include/cobalt/asm-sh/Makefile.in
index 3e1da6b..1d09a8e 100644
--- a/include/cobalt/asm-sh/Makefile.in
+++ b/include/cobalt/asm-sh/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-sh
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -83,35 +83,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)
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -310,8 +282,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-sh
-includesub_HEADERS = \
+noinst_HEADERS = \
        calibration.h   \
        features.h      \
        fptest.h        \
@@ -360,27 +331,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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -568,9 +518,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -621,7 +568,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -665,7 +612,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
        cscopelist-recursive ctags-recursive install-am install-strip \
@@ -678,13 +625,12 @@ uninstall-am: uninstall-includesubHEADERS
        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 installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includesubHEADERS
+       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 \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/include/cobalt/asm-x86/Makefile.am 
b/include/cobalt/asm-x86/Makefile.am
index 5c98444..0687aba 100644
--- a/include/cobalt/asm-x86/Makefile.am
+++ b/include/cobalt/asm-x86/Makefile.am
@@ -1,6 +1,5 @@
-includesubdir = $(includedir)/asm-x86
 
-includesub_HEADERS =   \
+noinst_HEADERS =       \
        calibration.h   \
        features.h      \
        fptest.h        \
diff --git a/include/cobalt/asm-x86/Makefile.in 
b/include/cobalt/asm-x86/Makefile.in
index 85e9715..ac35d5f 100644
--- a/include/cobalt/asm-x86/Makefile.in
+++ b/include/cobalt/asm-x86/Makefile.in
@@ -52,7 +52,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/cobalt/asm-x86
-DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+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 \
@@ -83,35 +83,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)
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -310,8 +282,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-includesubdir = $(includedir)/asm-x86
-includesub_HEADERS = \
+noinst_HEADERS = \
        calibration.h   \
        features.h      \
        fptest.h        \
@@ -361,27 +332,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)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -569,9 +519,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includesubdir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -622,7 +569,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includesubHEADERS
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -666,7 +613,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includesubHEADERS
+uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
        cscopelist-recursive ctags-recursive install-am install-strip \
@@ -679,13 +626,12 @@ uninstall-am: uninstall-includesubHEADERS
        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 installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includesubHEADERS
+       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 \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive 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