From c17ed71126def385fe0939803048d4912e2a2931 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 21:38:43 +0000 Subject: 2003-12-01 Ralf Corsepius * automake/compile.am: Add $(ARCH)/$(dirstamp) rules. * aclocal/lead-dot.m4: New (from automake-1.7f). * aclocal/rtems-top.m4: Require AM_SET_LEADING_DOT. Add AC_SUBST(dirstamp). --- testsuites/ChangeLog | 7 +++++++ testsuites/aclocal/lead-dot.m4 | 32 ++++++++++++++++++++++++++++++++ testsuites/aclocal/rtems-top.m4 | 3 +++ testsuites/automake/compile.am | 10 +++++++--- 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 testsuites/aclocal/lead-dot.m4 (limited to 'testsuites') diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index a66eba66cf..5f2220ffb7 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -1,3 +1,10 @@ +2003-12-01 Ralf Corsepius + + * automake/compile.am: Add $(ARCH)/$(dirstamp) rules. + * aclocal/lead-dot.m4: New (from automake-1.7f). + * aclocal/rtems-top.m4: Require AM_SET_LEADING_DOT. + Add AC_SUBST(dirstamp). + 2003-11-26 Ralf Corsepius * aclocal/canonical-target-name.m4, aclocal/canonicalize-tools.m4, diff --git a/testsuites/aclocal/lead-dot.m4 b/testsuites/aclocal/lead-dot.m4 new file mode 100644 index 0000000000..c8789fb2ce --- /dev/null +++ b/testsuites/aclocal/lead-dot.m4 @@ -0,0 +1,32 @@ +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) diff --git a/testsuites/aclocal/rtems-top.m4 b/testsuites/aclocal/rtems-top.m4 index 9dbcbbdb00..86720143a1 100644 --- a/testsuites/aclocal/rtems-top.m4 +++ b/testsuites/aclocal/rtems-top.m4 @@ -10,6 +10,7 @@ dnl AC_DEFUN([RTEMS_TOP], [dnl AC_REQUIRE([RTEMS_VERSIONING]) +AC_REQUIRE([AM_SET_LEADING_DOT]) AC_CONFIG_AUX_DIR([$1]) AC_CHECK_PROGS(MAKE, gmake make) AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl @@ -39,4 +40,6 @@ AC_SUBST(PROJECT_TOPdir) PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)" AC_SUBST(PROJECT_ROOT) + +AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) ])dnl diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am index 98b8d96fbe..97171efbc1 100644 --- a/testsuites/automake/compile.am +++ b/testsuites/automake/compile.am @@ -90,15 +90,19 @@ CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) AS = $(CC) ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) -${ARCH}/%.o: %.c +${ARCH}/%.o: %.c $(ARCH)/$(dirstamp) ${COMPILE} -o $@ -c $< -${ARCH}/%.o: %.cc +${ARCH}/%.o: %.cc $(ARCH)/$(dirstamp) ${CXXCOMPILE} -o $@ -c $< -${ARCH}/%.o: %.S +${ARCH}/%.o: %.S $(ARCH)/$(dirstamp) ${CCASCOMPILE} -DASM -o $@ -c $< +${ARCH}/$(dirstamp): + @$(mkinstalldirs) $(ARCH) + @: > $(ARCH)/$(dirstamp) + # Dependency files for use by gmake # NOTE: we don't put them into $(ARCH) # so that 'make clean' doesn't blow it away -- cgit v1.2.3