Module: xenomai-forge
Branch: next
Commit: 7f0a00f97a27a796c5727dd605ef38751b2be230
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=7f0a00f97a27a796c5727dd605ef38751b2be230
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat Jun 28 09:21:48 2014 +0200
build: fix distcheck
---
aclocal.m4 | 17 ++++++
configure | 120 ++++++++++++++++++++++++++++++++++++++-
configure.ac | 2 +-
include/Makefile.am | 2 -
include/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/cobalt/arch/Makefile.am | 2 +
lib/cobalt/arch/Makefile.in | 2 +-
scripts/Makefile.am | 18 ++++--
scripts/Makefile.in | 23 ++++++--
15 files changed, 180 insertions(+), 21 deletions(-)
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..512c211 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
+
+ # 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
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
diff --git a/configure.ac b/configure.ac
index f6a4e44..af0abc2 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
diff --git a/include/Makefile.am b/include/Makefile.am
index 52e65a2..53f9752 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,5 +17,3 @@ SUBDIRS += \
else
SUBDIRS += mercury
endif
-
-EXTRA_DIST = testing
diff --git a/include/Makefile.in b/include/Makefile.in
index 6c9d9f0..3c04aa5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -381,7 +381,6 @@ 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
all: xeno_config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
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/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/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:
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
