Hash :
1b4c84b8
Author :
Date :
2015-01-02T14:47:36
compile: don't place built object files in $(srcdir), ever ... ... even when a source file is specified as '$(srdir)/foo.c' or '$(top_srcdir)/bar.c'. And ditto for dependency-tracking makefile fragments (those under '.deps' directories). Such issues used to occur when the 'subdir-objects' option was given. This change should fix the second and last part of automake bug#13928. See also bug#16375 and bug#15293. * NEWS: Update. * bin/automake.in (handle_single_transform): Make sure object files and dependency-tracking makefile fragments coming from source like '$(srcdir)/foo.c' and '$(top_srcdir)/bar.c' are placed respectively under $(builddir) and $(top_builddir). * t/subobj-vpath-pr13928.sh: Enhance to expose even more aspects of the bug we've just fixed. * t/subobj-pr13928-more-langs.sh: New test, similar to the one above, but with non-C languages as well. * t/list-of-tests.mk (XFAIL_TESTS): Remove 'subobj-vpath-pr13928.sh', it's now supposed to pass. (handwritten_TESTS): Add 'subobj-pr13928-more-langs.sh'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
#! /bin/sh
# Copyright (C) 2015 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, see <http://www.gnu.org/licenses/>.
# Expose part of automake bug#13928, also for non-C languages: if the
# subdir-objects option is in use and a source file is listed in a
# _SOURCES variable with a leading $(srcdir) component, Automake will
# generate a Makefile that tries to create the corresponding object
# file in $(srcdir) as well.
required='cc c++ fortran77 fortran'
. test-init.sh
cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_F77
AC_PROG_FC
AM_CONDITIONAL([OBVIOUS], [:])
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
cat > Makefile.am <<'END'
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = sub
LESS = m/o/r/e
noinst_PROGRAMS = test test2
test_SOURCES = $(srcdir)/test.f90
test2_SOURCES = $(indir)
indir = ${indir2} $(empty)
indir2 =
if OBVIOUS
indir2 += ${srcdir}/$(LESS)///test.f
else
endif
test-objs:
ls -la @srcdir@ .
:
test ! -f @srcdir@/test.$(OBJEXT)
test -f test.$(OBJEXT)
test ! -f @srcdir@/m/o/r/e/test.$(OBJEXT)
test -f m/o/r/e/test.$(OBJEXT)
:
test ! -f @srcdir@/bar.$(OBJEXT)
test -f bar.$(OBJEXT)
test ! -f @srcdir@/baz.$(OBJEXT)
test -f baz.$(OBJEXT)
:
test ! -d @srcdir@/$(DEPDIR)
test ! -d @srcdir@/m/o/r/e/$(DEPDIR)
test -d $(DEPDIR)
test -d m/o/r/e/$(DEPDIR)
check-local: test-objs
END
mkdir sub
cat > sub/Makefile.am <<'END'
AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = foo
foo = baz
foo_SOURCES = foo.h \
$(top_srcdir)/bar.cc \
${top_srcdir}/$(foo).c
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
mkfiles='Makefile.in sub/Makefile.in'
$EGREP '(test|ba[rz])\.|DEPDIR|dirstamp|srcdir' $mkfiles # For debugging.
$EGREP '\$.(top_)?srcdir./(test|ba[rz]|\$.foo.)\.[o$]' $mkfiles && exit 1
$FGREP '\$.(top_)?srcdir./.*$(am__dirstamp)' $mkfiles && exit 1
$FGREP '\$.(top_)?srcdir./.*$(DEPDIR)' $mkfiles && exit 1
cat > test.f90 <<'EOF'
program foo
stop
end
EOF
mkdir -p m/o/r/e
cp test.f90 m/o/r/e/test.f
cat > sub/foo.h <<'END'
#ifdef __cplusplus
extern "C"
#endif
int foo (void);
END
cat > bar.cc <<'END'
#include "foo.h"
#include <iostream>
int main (void)
{
std::cout << "OK!" << "\n";
return foo ();
}
END
cat > baz.c <<'END'
#include "foo.h"
int foo (void)
{
return 0;
}
END
mkdir build
cd build
../configure
$MAKE
$MAKE test-objs
$MAKE distcheck
: