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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sat Jun 28 09:21:48 2014 +0200

build: fix distcheck

---

 Makefile.am                            |   21 ++++--
 Makefile.in                            |   32 ++++++--
 aclocal.m4                             |   17 +++++
 configure                              |  127 ++++++++++++++++++++++++++++++--
 configure.ac                           |    9 +--
 doc/install-dist.rules                 |    1 -
 include/Makefile.am                    |   11 ++-
 include/Makefile.in                    |   14 +++-
 include/cobalt/kernel/Makefile.am      |    1 +
 include/cobalt/kernel/Makefile.in      |    1 +
 include/cobalt/kernel/rtdm/Makefile.am |    1 +
 include/cobalt/kernel/rtdm/Makefile.in |    1 +
 include/cobalt/sys/Makefile.am         |    3 +-
 include/cobalt/sys/Makefile.in         |    3 +-
 include/copperplate/Makefile.am        |    3 +-
 include/copperplate/Makefile.in        |    3 +-
 include/vxworks/Makefile.am            |    1 +
 include/vxworks/Makefile.in            |    1 +
 lib/Makefile.am                        |   17 ++++-
 lib/Makefile.in                        |   11 ++-
 lib/cobalt/arch/Makefile.am            |    2 +
 lib/cobalt/arch/Makefile.in            |    2 +-
 lib/copperplate/Makefile.am            |    2 +
 lib/copperplate/Makefile.in            |    2 +-
 scripts/Makefile.am                    |   18 ++++-
 scripts/Makefile.in                    |   23 ++++--
 testsuite/Makefile.am                  |   19 +++--
 testsuite/Makefile.in                  |   16 ++--
 testsuite/latency/Makefile.am          |   10 +--
 testsuite/latency/Makefile.in          |    6 +-
 30 files changed, 301 insertions(+), 77 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1440ae5..2900cef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS=-I config
 SUDO=sudo
 
 SUBDIRS =              \
+       doc             \
        lib             \
        config          \
        include         \
@@ -11,17 +12,21 @@ SUBDIRS =           \
        utils           \
        demo
 
-if XENO_RUN_DOC
-SUBDIRS += doc
+EXTRA_DIST = kernel debian
+
+DIST_SUBDIRS =         \
+       config          \
+       demo            \
+       doc             \
+       include         \
+       lib             \
+       scripts         \
+       testsuite       \
+       utils
 
 doc/%: FORCE
        $(MAKE) -C doc/ $*
 
-.PHONY: FORCE
-endif
-
-EXTRA_DIST = kernel debian
-
 dist-hook:
        rm -fr `find $(distdir) -name '.svn' -o -name CVS  -o -name '.#*' \
                -o -name '*~' -o -name autom4te.cache`
@@ -72,3 +77,5 @@ install-exec-local: devices
 
 install-user:
        $(MAKE) SUDO=false install
+
+.PHONY: FORCE
diff --git a/Makefile.in b/Makefile.in
index 82b31f6..24c17d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@XENO_RUN_DOC_TRUE@am__append_1 = doc
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
@@ -157,7 +156,6 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = lib config include scripts testsuite utils demo doc
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -366,9 +364,27 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I config
 SUDO = sudo
-SUBDIRS = lib config include scripts testsuite utils demo \
-       $(am__append_1)
+SUBDIRS = \
+       doc             \
+       lib             \
+       config          \
+       include         \
+       scripts         \
+       testsuite       \
+       utils           \
+       demo
+
 EXTRA_DIST = kernel debian
+DIST_SUBDIRS = \
+       config          \
+       demo            \
+       doc             \
+       include         \
+       lib             \
+       scripts         \
+       testsuite       \
+       utils
+
 all: all-recursive
 
 .SUFFIXES:
@@ -830,10 +846,8 @@ uninstall-am:
        ps ps-am tags tags-am uninstall uninstall-am
 
 
-@XENO_RUN_DOC_TRUE@doc/%: FORCE
-@XENO_RUN_DOC_TRUE@    $(MAKE) -C doc/ $*
-
-@XENO_RUN_DOC_TRUE@.PHONY: FORCE
+doc/%: FORCE
+       $(MAKE) -C doc/ $*
 
 dist-hook:
        rm -fr `find $(distdir) -name '.svn' -o -name CVS  -o -name '.#*' \
@@ -884,6 +898,8 @@ install-exec-local: devices
 install-user:
        $(MAKE) SUDO=false install
 
+.PHONY: FORCE
+
 # 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.
 .NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index c5ce229..f473e28 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1005,6 +1005,23 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 475949f..5286990 100755
--- a/configure
+++ b/configure
@@ -4813,9 +4813,125 @@ AMTAR='$${TAR-tar}'
 
 
 # We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
+_am_tools='gnutar plaintar pax cpio none'
+
+# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' 
is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " 
>&6; }
+      if test $am_uid -le $am_max_uid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         _am_tools=none
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' 
is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " 
>&6; }
+      if test $am_gid -le $am_max_gid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        _am_tools=none
+      fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar 
archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
+   ($_am_tar --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && break
+      done
+      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x ustar -w "$$tardir"'
+      am__tar_='pax -L -x ustar -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+      am__untar='cpio -i -H ustar -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_ustar}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ 
>conftest.tar" >&5
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+   ($am__untar <conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  if ${am_cv_prog_tar_ustar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_prog_tar_ustar=$_am_tool
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -14114,13 +14230,8 @@ XENO_CONFIG_ARGS="$ac_configure_args"
 
 
 
-ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile 
scripts/xeno-config:scripts/xeno-config-$rtcore_type.in scripts/xeno 
lib/Makefile lib/boilerplate/Makefile lib/cobalt/Makefile 
lib/cobalt/arch/Makefile lib/cobalt/arch/arm/Makefile 
lib/cobalt/arch/arm/include/Makefile lib/cobalt/arch/arm/include/asm/Makefile 
lib/cobalt/arch/arm/include/asm/xenomai/Makefile 
lib/cobalt/arch/powerpc/Makefile lib/cobalt/arch/powerpc/include/Makefile 
lib/cobalt/arch/powerpc/include/asm/Makefile 
lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile 
lib/cobalt/arch/blackfin/Makefile lib/cobalt/arch/blackfin/include/Makefile 
lib/cobalt/arch/blackfin/include/asm/Makefile 
lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile 
lib/cobalt/arch/x86/Makefile lib/cobalt/arch/x86/include/Makefile 
lib/cobalt/arch/x86/include/asm/Makefile 
lib/cobalt/arch/x86/include/asm/xenomai/Makefile lib/cobalt/arch/nios2/Makefile 
lib/cobalt/arch/nios2/include/Makefile lib/cobalt/arch/nios2/include/asm/Makef
 ile lib/cobalt/arch/nios2/include/asm/xenomai/Makefile 
lib/cobalt/arch/sh/Makefile lib/cobalt/arch/sh/include/Makefile 
lib/cobalt/arch/sh/include/asm/Makefile 
lib/cobalt/arch/sh/include/asm/xenomai/Makefile lib/copperplate/Makefile 
lib/copperplate/regd/Makefile lib/alchemy/Makefile lib/vxworks/Makefile 
lib/psos/Makefile lib/analogy/Makefile testsuite/Makefile 
testsuite/latency/Makefile testsuite/switchtest/Makefile 
testsuite/clocktest/Makefile testsuite/unit/Makefile 
testsuite/xeno-test/Makefile testsuite/regression/Makefile 
testsuite/regression/posix/Makefile utils/Makefile utils/can/Makefile 
utils/analogy/Makefile utils/ps/Makefile utils/slackspot/Makefile demo/Makefile 
demo/posix/Makefile demo/posix/cobalt/Makefile demo/alchemy/Makefile 
demo/alchemy/cobalt/Makefile include/Makefile include/nocore/Makefile 
include/cobalt/uapi/Makefile include/cobalt/uapi/asm-generic/Makefile 
include/cobalt/uapi/kernel/Makefile include/cobalt/uapi/rtdm/Makefile 
include/cobalt/Makefile include/cobal
 t/sys/Makefile include/cobalt/kernel/Makefile 
include/cobalt/kernel/rtdm/Makefile include/cobalt/kernel/rtdm/analogy/Makefile 
include/cobalt/boilerplate/Makefile include/rtdm/Makefile 
include/rtdm/uapi/Makefile include/mercury/Makefile 
include/mercury/boilerplate/Makefile include/boilerplate/Makefile 
include/copperplate/Makefile include/alchemy/Makefile include/vxworks/Makefile 
include/psos/Makefile"
-
+ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile 
scripts/xeno-config:scripts/xeno-config-$rtcore_type.in scripts/xeno 
lib/Makefile lib/boilerplate/Makefile lib/cobalt/Makefile 
lib/cobalt/arch/Makefile lib/cobalt/arch/arm/Makefile 
lib/cobalt/arch/arm/include/Makefile lib/cobalt/arch/arm/include/asm/Makefile 
lib/cobalt/arch/arm/include/asm/xenomai/Makefile 
lib/cobalt/arch/powerpc/Makefile lib/cobalt/arch/powerpc/include/Makefile 
lib/cobalt/arch/powerpc/include/asm/Makefile 
lib/cobalt/arch/powerpc/include/asm/xenomai/Makefile 
lib/cobalt/arch/blackfin/Makefile lib/cobalt/arch/blackfin/include/Makefile 
lib/cobalt/arch/blackfin/include/asm/Makefile 
lib/cobalt/arch/blackfin/include/asm/xenomai/Makefile 
lib/cobalt/arch/x86/Makefile lib/cobalt/arch/x86/include/Makefile 
lib/cobalt/arch/x86/include/asm/Makefile 
lib/cobalt/arch/x86/include/asm/xenomai/Makefile lib/cobalt/arch/nios2/Makefile 
lib/cobalt/arch/nios2/include/Makefile lib/cobalt/arch/nios2/include/asm/Makef
 ile lib/cobalt/arch/nios2/include/asm/xenomai/Makefile 
lib/cobalt/arch/sh/Makefile lib/cobalt/arch/sh/include/Makefile 
lib/cobalt/arch/sh/include/asm/Makefile 
lib/cobalt/arch/sh/include/asm/xenomai/Makefile lib/copperplate/Makefile 
lib/copperplate/regd/Makefile lib/alchemy/Makefile lib/vxworks/Makefile 
lib/psos/Makefile lib/analogy/Makefile testsuite/Makefile 
testsuite/latency/Makefile testsuite/switchtest/Makefile 
testsuite/clocktest/Makefile testsuite/unit/Makefile 
testsuite/xeno-test/Makefile testsuite/regression/Makefile 
testsuite/regression/posix/Makefile utils/Makefile utils/can/Makefile 
utils/analogy/Makefile utils/ps/Makefile utils/slackspot/Makefile demo/Makefile 
demo/posix/Makefile demo/posix/cobalt/Makefile demo/alchemy/Makefile 
demo/alchemy/cobalt/Makefile include/Makefile include/nocore/Makefile 
include/cobalt/uapi/Makefile include/cobalt/uapi/asm-generic/Makefile 
include/cobalt/uapi/kernel/Makefile include/cobalt/uapi/rtdm/Makefile 
include/cobalt/Makefile include/cobal
 t/sys/Makefile include/cobalt/kernel/Makefile 
include/cobalt/kernel/rtdm/Makefile include/cobalt/kernel/rtdm/analogy/Makefile 
include/cobalt/boilerplate/Makefile include/rtdm/Makefile 
include/rtdm/uapi/Makefile include/mercury/Makefile 
include/mercury/boilerplate/Makefile include/boilerplate/Makefile 
include/copperplate/Makefile include/alchemy/Makefile include/vxworks/Makefile 
include/psos/Makefile doc/Makefile doc/doxygen/Makefile 
doc/doxygen/xeno3prm-common.conf doc/doxygen/xeno3prm-html.conf 
doc/doxygen/xeno3prm-latex.conf doc/asciidoc/Makefile"
 
-if test \! x$XENO_RUN_DOC = x ; then
-      ac_config_files="$ac_config_files doc/Makefile doc/doxygen/Makefile 
doc/doxygen/xeno3prm-common.conf doc/doxygen/xeno3prm-html.conf 
doc/doxygen/xeno3prm-latex.conf doc/asciidoc/Makefile"
-
-fi
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
diff --git a/configure.ac b/configure.ac
index f6a4e44..f076e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ AC_DEFINE_UNQUOTED(CONFIG_XENO_HOST_STRING,"$host",[Host 
system alias])
 XENO_HOST_STRING="$host"
 AC_DEFINE_UNQUOTED(CONFIG_XENO_COMPILER,"`$CC -v 2>&1 | tail -n 1`",[Compiler])
 
-AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
+AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE
 AM_PROG_AS
 AM_PROG_LEX
@@ -878,17 +878,12 @@ AC_CONFIG_FILES([ \
        include/alchemy/Makefile \
        include/vxworks/Makefile \
        include/psos/Makefile \
-       ])
-
-if test \! x$XENO_RUN_DOC = x ; then
-      AC_CONFIG_FILES([ \
        doc/Makefile \
        doc/doxygen/Makefile \
        doc/doxygen/xeno3prm-common.conf \
        doc/doxygen/xeno3prm-html.conf \
        doc/doxygen/xeno3prm-latex.conf \
        doc/asciidoc/Makefile \
-      ])
-fi
+       ])
 
 AC_OUTPUT()
diff --git a/doc/install-dist.rules b/doc/install-dist.rules
index 1be7f2f..02b7cfd 100644
--- a/doc/install-dist.rules
+++ b/doc/install-dist.rules
@@ -11,7 +11,6 @@
 #
 # PDF_DOCSDIR & MAN_DOCSDIR: same thing for pdf and man files.
 docdir=@docdir@
-
 doc_top_distdir=$(top_builddir)/$(PACKAGE)-$(VERSION)
 GEN_DOC_DIST_ROOT=$(doc_top_distdir)/doc/prebuilt
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 52e65a2..2f7a45b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -18,4 +18,13 @@ else
 SUBDIRS += mercury
 endif
 
-EXTRA_DIST = testing
+DIST_SUBDIRS =                 \
+       alchemy         \
+       boilerplate     \
+       cobalt          \
+       copperplate     \
+       mercury         \
+       nocore          \
+       psos            \
+       rtdm            \
+       vxworks
diff --git a/include/Makefile.in b/include/Makefile.in
index 6c9d9f0..f06c109 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -185,8 +185,6 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = nocore boilerplate copperplate alchemy psos vxworks \
-       cobalt rtdm mercury
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -381,7 +379,17 @@ nodist_include_HEADERS = $(CONFIG_HEADER)
 include_HEADERS = version.h
 SUBDIRS = nocore boilerplate copperplate alchemy psos vxworks \
        $(am__append_1) $(am__append_2)
-EXTRA_DIST = testing
+DIST_SUBDIRS = \
+       alchemy         \
+       boilerplate     \
+       cobalt          \
+       copperplate     \
+       mercury         \
+       nocore          \
+       psos            \
+       rtdm            \
+       vxworks
+
 all: xeno_config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/include/cobalt/kernel/Makefile.am 
b/include/cobalt/kernel/Makefile.am
index ad6c7f2..3803aac 100644
--- a/include/cobalt/kernel/Makefile.am
+++ b/include/cobalt/kernel/Makefile.am
@@ -32,6 +32,7 @@ noinst_HEADERS =      \
        thread.h        \
        timer.h         \
        trace.h         \
+       tree.h          \
        vdso.h          \
        vfile.h
 
diff --git a/include/cobalt/kernel/Makefile.in 
b/include/cobalt/kernel/Makefile.in
index 23e307d..a718dce 100644
--- a/include/cobalt/kernel/Makefile.in
+++ b/include/cobalt/kernel/Makefile.in
@@ -375,6 +375,7 @@ noinst_HEADERS = \
        thread.h        \
        timer.h         \
        trace.h         \
+       tree.h          \
        vdso.h          \
        vfile.h
 
diff --git a/include/cobalt/kernel/rtdm/Makefile.am 
b/include/cobalt/kernel/rtdm/Makefile.am
index 00dd6fe..1013780 100644
--- a/include/cobalt/kernel/rtdm/Makefile.am
+++ b/include/cobalt/kernel/rtdm/Makefile.am
@@ -3,6 +3,7 @@ noinst_HEADERS =        \
        can.h           \
        cobalt.h        \
        driver.h        \
+       fd.h            \
        ipc.h           \
        rtdm.h          \
        serial.h        \
diff --git a/include/cobalt/kernel/rtdm/Makefile.in 
b/include/cobalt/kernel/rtdm/Makefile.in
index bd041ad..2b46f3c 100644
--- a/include/cobalt/kernel/rtdm/Makefile.in
+++ b/include/cobalt/kernel/rtdm/Makefile.in
@@ -346,6 +346,7 @@ noinst_HEADERS = \
        can.h           \
        cobalt.h        \
        driver.h        \
+       fd.h            \
        ipc.h           \
        rtdm.h          \
        serial.h        \
diff --git a/include/cobalt/sys/Makefile.am b/include/cobalt/sys/Makefile.am
index 8a38d87..6923b35 100644
--- a/include/cobalt/sys/Makefile.am
+++ b/include/cobalt/sys/Makefile.am
@@ -4,4 +4,5 @@ includesub_HEADERS =    \
        ioctl.h         \
        select.h        \
        socket.h        \
-       time.h
+       time.h          \
+       timerfd.h
diff --git a/include/cobalt/sys/Makefile.in b/include/cobalt/sys/Makefile.in
index cd1649f..999fa28 100644
--- a/include/cobalt/sys/Makefile.in
+++ b/include/cobalt/sys/Makefile.in
@@ -333,7 +333,8 @@ includesub_HEADERS = \
        ioctl.h         \
        select.h        \
        socket.h        \
-       time.h
+       time.h          \
+       timerfd.h
 
 all: all-am
 
diff --git a/include/copperplate/Makefile.am b/include/copperplate/Makefile.am
index 89b92ff..4b16fa7 100644
--- a/include/copperplate/Makefile.am
+++ b/include/copperplate/Makefile.am
@@ -7,11 +7,12 @@ includesub_HEADERS =          \
        eventobj.h              \
        heapobj.h               \
        init.h                  \
-       semobj.h                \
        reference.h             \
        registry.h              \
+       semobj.h                \
        syncobj.h               \
        threadobj.h             \
+       timerobj.h              \
        traceobj.h              \
        wrappers.h
 
diff --git a/include/copperplate/Makefile.in b/include/copperplate/Makefile.in
index 996cde1..178d03b 100644
--- a/include/copperplate/Makefile.in
+++ b/include/copperplate/Makefile.in
@@ -336,11 +336,12 @@ includesub_HEADERS = \
        eventobj.h              \
        heapobj.h               \
        init.h                  \
-       semobj.h                \
        reference.h             \
        registry.h              \
+       semobj.h                \
        syncobj.h               \
        threadobj.h             \
+       timerobj.h              \
        traceobj.h              \
        wrappers.h
 
diff --git a/include/vxworks/Makefile.am b/include/vxworks/Makefile.am
index 71b5e18..f880426 100644
--- a/include/vxworks/Makefile.am
+++ b/include/vxworks/Makefile.am
@@ -3,6 +3,7 @@ includesubdir = $(includedir)/vxworks
 includesub_HEADERS =   \
        errnoLib.h      \
        intLib.h        \
+       kernLib.h       \
        lstLib.h        \
        memPartLib.h    \
        msgQLib.h       \
diff --git a/include/vxworks/Makefile.in b/include/vxworks/Makefile.in
index 8c0d9da..560bcce 100644
--- a/include/vxworks/Makefile.in
+++ b/include/vxworks/Makefile.in
@@ -332,6 +332,7 @@ includesubdir = $(includedir)/vxworks
 includesub_HEADERS = \
        errnoLib.h      \
        intLib.h        \
+       kernLib.h       \
        lstLib.h        \
        memPartLib.h    \
        msgQLib.h       \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2d0a4f9..47e02ca 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,8 +6,17 @@ SUBDIRS +=     \
        analogy
 endif
 
-SUBDIRS +=     \
-       copperplate \
-       alchemy \
-       vxworks \
+SUBDIRS +=             \
+       copperplate     \
+       alchemy         \
+       vxworks         \
        psos
+
+DIST_SUBDIRS =                 \
+       alchemy         \
+       analogy         \
+       boilerplate     \
+       cobalt          \
+       copperplate     \
+       psos            \
+       vxworks
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4f6f11b..6383305 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -152,8 +152,6 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = boilerplate cobalt analogy copperplate alchemy vxworks \
-       psos
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -345,6 +343,15 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = boilerplate $(am__append_1) copperplate alchemy vxworks psos
+DIST_SUBDIRS = \
+       alchemy         \
+       analogy         \
+       boilerplate     \
+       cobalt          \
+       copperplate     \
+       psos            \
+       vxworks
+
 all: all-recursive
 
 .SUFFIXES:
diff --git a/lib/cobalt/arch/Makefile.am b/lib/cobalt/arch/Makefile.am
index 08461d4..276414b 100644
--- a/lib/cobalt/arch/Makefile.am
+++ b/lib/cobalt/arch/Makefile.am
@@ -1,2 +1,4 @@
 
 SUBDIRS = @XENO_TARGET_ARCH@
+
+DIST_SUBDIRS = arm blackfin nios2 powerpc sh x86
diff --git a/lib/cobalt/arch/Makefile.in b/lib/cobalt/arch/Makefile.in
index 061e238..9fe9a31 100644
--- a/lib/cobalt/arch/Makefile.in
+++ b/lib/cobalt/arch/Makefile.in
@@ -148,7 +148,6 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -340,6 +339,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = @XENO_TARGET_ARCH@
+DIST_SUBDIRS = arm blackfin nios2 powerpc sh x86
 all: all-recursive
 
 .SUFFIXES:
diff --git a/lib/copperplate/Makefile.am b/lib/copperplate/Makefile.am
index 2664e53..697e8a1 100644
--- a/lib/copperplate/Makefile.am
+++ b/lib/copperplate/Makefile.am
@@ -77,6 +77,8 @@ if XENO_REGISTRY
 SUBDIRS += regd
 endif
 
+DIST_SUBDIRS = regd
+
 SPARSE = sparse
 
 sparse:
diff --git a/lib/copperplate/Makefile.in b/lib/copperplate/Makefile.in
index 45961c6..b4c7517 100644
--- a/lib/copperplate/Makefile.in
+++ b/lib/copperplate/Makefile.in
@@ -253,7 +253,6 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = . regd
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -467,6 +466,7 @@ libcopperplate_la_LIBADD = libversion.la $(am__append_1) \
 @XENO_REGISTRY_TRUE@   @XENO_FUSE_CFLAGS@
 
 SUBDIRS = . $(am__append_7)
+DIST_SUBDIRS = regd
 SPARSE = sparse
 all: all-recursive
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cc13a35..9d127b9 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -10,11 +10,21 @@ install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(libdir)
        $(INSTALL_DATA) $(srcdir)/dynlist.ld $(DESTDIR)$(libdir)
 
+uninstall-local:
+       $(RM) $(DESTDIR)$(libdir)/dynlist.ld
+       @if test -r $(srcdir)/postinstall.sh ; then \
+          echo "Running post-uninstall script..." ;\
+          $(srcdir)/postinstall.sh --uninstall ; \
+       fi
+
 EXTRA_DIST =                           \
+       $(wildcard postinstall.sh)      \
+       Kconfig.frag                    \
        bootstrap                       \
+       dynlist.ld                      \
+       histo.gp                        \
        prepare-kernel.sh               \
        wrap-link.sh                    \
-       dynlist.ld                      \
-       Kconfig.frag                    \
-       $(wildcard postinstall.sh)      \
-       histo.gp
+       xeno-config-cobalt.in           \
+       xeno-config-mercury.in          \
+       xeno.in
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index d45c555..b766a15 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -312,13 +312,16 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 bin_SCRIPTS = xeno-config xeno wrap-link.sh
 EXTRA_DIST = \
+       $(wildcard postinstall.sh)      \
+       Kconfig.frag                    \
        bootstrap                       \
+       dynlist.ld                      \
+       histo.gp                        \
        prepare-kernel.sh               \
        wrap-link.sh                    \
-       dynlist.ld                      \
-       Kconfig.frag                    \
-       $(wildcard postinstall.sh)      \
-       histo.gp
+       xeno-config-cobalt.in           \
+       xeno-config-mercury.in          \
+       xeno.in
 
 all: all-am
 
@@ -536,7 +539,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS
+uninstall-am: uninstall-binSCRIPTS uninstall-local
 
 .MAKE: install-am install-strip
 
@@ -551,7 +554,8 @@ uninstall-am: uninstall-binSCRIPTS
        install-strip installcheck installcheck-am installdirs \
        maintainer-clean maintainer-clean-generic mostlyclean \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags-am uninstall uninstall-am uninstall-binSCRIPTS
+       tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+       uninstall-local
 
 
 install-exec-local:
@@ -564,6 +568,13 @@ install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(libdir)
        $(INSTALL_DATA) $(srcdir)/dynlist.ld $(DESTDIR)$(libdir)
 
+uninstall-local:
+       $(RM) $(DESTDIR)$(libdir)/dynlist.ld
+       @if test -r $(srcdir)/postinstall.sh ; then \
+          echo "Running post-uninstall script..." ;\
+          $(srcdir)/postinstall.sh --uninstall ; \
+       fi
+
 # 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.
 .NOEXPORT:
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 533cef8..a99c272 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -2,12 +2,17 @@
 SUBDIRS = latency unit
 
 if XENO_COBALT
-
-SUBDIRS += \
-       clocktest \
-       latency \
-       regression \
-       switchtest \
+SUBDIRS +=             \
+       clocktest       \
+       regression      \
+       switchtest      \
        xeno-test
-
 endif
+
+DIST_SUBDIRS =         \
+       clocktest       \
+       latency         \
+       regression      \
+       switchtest      \
+       unit            \
+       xeno-test
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 96d7a6f..22a83f9 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -79,10 +79,9 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @XENO_COBALT_TRUE@am__append_1 = \
-@XENO_COBALT_TRUE@     clocktest \
-@XENO_COBALT_TRUE@     latency \
-@XENO_COBALT_TRUE@     regression \
-@XENO_COBALT_TRUE@     switchtest \
+@XENO_COBALT_TRUE@     clocktest       \
+@XENO_COBALT_TRUE@     regression      \
+@XENO_COBALT_TRUE@     switchtest      \
 @XENO_COBALT_TRUE@     xeno-test
 
 subdir = testsuite
@@ -155,7 +154,6 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = latency unit clocktest regression switchtest xeno-test
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -347,6 +345,14 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = latency unit $(am__append_1)
+DIST_SUBDIRS = \
+       clocktest       \
+       latency         \
+       regression      \
+       switchtest      \
+       unit            \
+       xeno-test
+
 all: all-recursive
 
 .SUFFIXES:
diff --git a/testsuite/latency/Makefile.am b/testsuite/latency/Makefile.am
index 55ba31b..b58bf40 100644
--- a/testsuite/latency/Makefile.am
+++ b/testsuite/latency/Makefile.am
@@ -6,8 +6,8 @@ test_PROGRAMS = latency
 
 latency_SOURCES = latency.c
 
-latency_CPPFLAGS =                                     \
-       $(XENO_USER_CFLAGS)                             \
+latency_CPPFLAGS =             \
+       $(XENO_USER_CFLAGS)     \
        -I$(top_srcdir)/include
 
 latency_LDFLAGS = $(XENO_POSIX_WRAPPERS)
@@ -17,7 +17,7 @@ if XENO_COBALT
 core_libs += ../../lib/cobalt/libcobalt.la
 endif
 
-latency_LDADD = \
-       $(core_libs)                            \
-        @XENO_USER_LDADD@                      \
+latency_LDADD =                        \
+       $(core_libs)            \
+        @XENO_USER_LDADD@      \
        -lpthread -lrt -lm
diff --git a/testsuite/latency/Makefile.in b/testsuite/latency/Makefile.in
index 6c17cca..bc29321 100644
--- a/testsuite/latency/Makefile.in
+++ b/testsuite/latency/Makefile.in
@@ -338,14 +338,14 @@ testdir = @XENO_TEST_DIR@
 CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC)
 latency_SOURCES = latency.c
 latency_CPPFLAGS = \
-       $(XENO_USER_CFLAGS)                             \
+       $(XENO_USER_CFLAGS)     \
        -I$(top_srcdir)/include
 
 latency_LDFLAGS = $(XENO_POSIX_WRAPPERS)
 core_libs = $(am__append_1)
 latency_LDADD = \
-       $(core_libs)                            \
-        @XENO_USER_LDADD@                      \
+       $(core_libs)            \
+        @XENO_USER_LDADD@      \
        -lpthread -lrt -lm
 
 all: all-am


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

Reply via email to