variable $(AM_MAKEFLAGS) has been removed, and its content is no more
passed to recursive make invocations.
+* The variables $(DISTFILES), $(DIST_COMMON) and $(DIST_SOURCES) had
+ never been documented in mainline Automake, and were always intended
+ to be internal variables. But that was not clear from their names.
+ So we have renamed rename like this:
+
+ DISTFILES => am__dist_files
+ DIST_COMMON => am__dist_common
+ DIST_SOURCES => am__dist_sources
+
+ Do not use any of these variables in your Makefiles!
+
-----
Copyright (C) 2012 Free Software Foundation, Inc.
my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh);
# Commonly found files we look for and automatically include in
-# DISTFILES.
+# distributed files.
my @common_files =
(qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
# This maps extensions onto language names.
my %extension_map = ();
-# List of the DIST_COMMON files we discovered while reading
+# List of the distributed files we discovered while reading
# configure.ac.
my $configure_dist_common = '';
# check that. But if the file is in a subdir without a Makefile,
# we want to distribute it here if we are doing '.'. Ugly!
# Also, in some corner cases, it's possible that the following code
- # will cause the same file to appear in the $(DIST_COMMON) variables
+ # will cause the same file to appear in the $(am__dist_common) variables
# of two distinct Makefiles; but this is not a problem, since the
# 'distdir' target in 'lib/am/distdir.am' can deal with the same
# file being distributed multiple times.
}
}
- # We don't expected further attempts to modify DIST_COMMON after
- # this point, so disallow it, for extra safety.
+ # We don't expected further attempts to modify $(am__dist_common)
+ # after this point, so disallow it, for extra safety.
$handle_dist_run = 1;
# Scan EXTRA_DIST to see if we need to distribute anything from a
if -f $config_aux_dir . '/install.sh';
# Preserve dist_common for later.
- $configure_dist_common = variable_value ('DIST_COMMON') || '';
+ $configure_dist_common = variable_value ('am__dist_common') || '';
}
push (@include_stack, "\$\(top_srcdir\)/$path");
# Distribute any included file.
- # Always use the $(top_srcdir) prefix in DIST_COMMON,
+ # Always use the $(top_srcdir) prefix in am__dist_common,
# otherwise OSF make will implicitly copy the included
# file in the build tree during "make distdir" to satisfy
# the dependency.
{
$path =~ s/\$\(srcdir\)\///;
push (@include_stack, "\$\(srcdir\)/$path");
- # Always use the $(srcdir) prefix in DIST_COMMON,
+ # Always use the $(srcdir) prefix in am__dist_common,
# otherwise OSF make will implicitly copy the included
# file in the build tree during "make distdir" to satisfy
# the dependency.
# &push_required_file ($DIR, $FILE, $FULLFILE)
# --------------------------------------------------
-# Push the given file onto DIST_COMMON.
+# Push the given file onto $(am__dist_common).
sub push_required_file
{
my ($dir, $file, $fullfile) = @_;
else
{
prog_error "a Makefile in relative directory $relative_dir " .
- "can't add files in directory $dir to DIST_COMMON";
+ "can't add files in directory $dir to the list " .
+ "of distributed files";
}
}
return
if $found_it && (! $add_missing || ! $force_missing);
- # If we've already looked for it, we're done. You might
- # wonder why we don't do this before searching for the
- # file. If we do that, then something like
- # AC_OUTPUT(subdir/foo foo) will fail to put foo.in into
- # DIST_COMMON.
+ # If we've already looked for it, we're done. You might wonder why
+ # we don't do this before searching for the file. If we do that,
+ # then something like AC_OUTPUT(subdir/foo foo) will fail to put
+ # 'foo.in' into the list of distributed files $(am__dist_common).
if (! $found_it)
{
return if defined $required_file_not_found{$fullfile};
{
prog_error "push_dist_common run after handle_dist"
if $handle_dist_run;
- Automake::Variable::define ('DIST_COMMON', VAR_AUTOMAKE, '+', TRUE, "@_",
- '', INTERNAL, VAR_PRETTY);
+ Automake::Variable::define ('am__dist_common', VAR_AUTOMAKE, '+',
+ TRUE, "@_", '', INTERNAL, VAR_PRETTY);
}
define_pretty_variable ('SOURCES', TRUE, INTERNAL, @sources);
if (! option 'no-dist')
{
- define_pretty_variable ('DIST_SOURCES', TRUE, INTERNAL, @dist_sources);
+ define_pretty_variable ('am__dist_sources', TRUE, INTERNAL,
+ @dist_sources);
}
handle_texinfo;
## Avoid the "deleted header file" problem for the dependencies.
?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS%:
-DIST_COMMON += %MAKEFILE-AM%
+am__dist_common += %MAKEFILE-AM%
## --------------------------- ##
## don't exist. This is especially important for configure, since it
## won't be created until autoconf is run -- which might be after
## automake is run.
-DIST_COMMON += $(top_srcdir)/configure $(am__configure_deps)
+am__dist_common += $(top_srcdir)/configure $(am__configure_deps)
endif %?TOPDIR_P%
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
## -------------- ##
if %?DIST%
-DIST_COMMON += %DISTVAR%
+am__dist_common += %DISTVAR%
endif %?DIST%
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
-DISTFILES = $(call am__uniq, \
- $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST))
+am__dist_files = $(call am__uniq, \
+ $(am__dist_common) $(am__dist_sources) $(TEXINFOS) $(EXTRA_DIST))
-## Try to avoid repeated slashed in the $(DISTFILES) entries, to make the
+## Try to avoid repeated slashed in the entries, to make the
## filtering in the 'am__dist_files_1' definition below more reliable.
## This idiom should compress up to four consecutive '/' characters in
-## each $(DISTFILES) entry.
-am__dist_files_1 = $(subst //,/,$(subst //,/,$(DISTFILES)))
+## each $(am__dist_files) entry.
+am__dist_files_1 = $(subst //,/,$(subst //,/,$(am__dist_files)))
am__dist_files_2 = \
## Files filtered out here require an ad-hoc "munging"; see the two
## situations that it's probably not worth worrying about.
$(patsubst $(srcdir)/%, %, \
$(filter $(srcdir)/%, $(am__dist_files_1))) \
-## Also rewrite $(top_srcdir) (which sometimes appears in DISTFILES, and
-## can be absolute) by $(top_builddir) (which is always relative). If
-## needed, $(srcdir) will be prepended later by our VPATH-aware rules.
+## Also rewrite $(top_srcdir) -- which can sometimes appear in
+## $(am__dist_common), and can be absolute -- by $(top_builddir)
+## (which is always relative). If needed, $(srcdir) will be
+## prepended later by our VPATH-aware rules.
## The same caveats reported above apply.
$(patsubst $(top_srcdir)/%, $(top_builddir)/%, \
$(filter $(top_srcdir)/%, $(am__dist_files_1)))
## Strip extra whitespaces, for more safety.
-am__dist_files = $(strip $(am__dist_files_2))
-
-## Given the pro-processing done above to 'am__dist_files', this
-## definition ensures that we won't try to create the wrong directories
-## when $(top_srcdir) or $(srcdir) appears in DISTFILES. For example,
-## with EXTRA_DIST containing "$(srcdir)/subdir/file", this will allow
-## our rules to correctly create "$(distdir)/subdir", and not
+am__dist_files_cooked = $(strip $(am__dist_files_2))
+
+## Given the pre-processing done above to the list of distributed files,
+## this definition ensures that we won't try to create the wrong
+## directories when $(top_srcdir) or $(srcdir) appears in some entry of
+## the list of all distributed files.
+## For example, with EXTRA_DIST containing "$(srcdir)/subdir/file", this
+## will allow our rules to correctly create "$(distdir)/subdir", and not
## "$(distdir)/$(srcdir)/subdir" -- which, in a VPATH build where
-## $(subdir) = .., would be the build directory!
+## "$(subdir) = ..", would be the build directory!
am__dist_parent_dirs = $(call am__uniq, \
- $(filter-out ., $(patsubst ./%,%,$(dir $(am__dist_files)))))
+ $(filter-out ., $(patsubst ./%,%,$(dir $(am__dist_files_cooked)))))
if %?TOPDIR_P%
distdir = $(PACKAGE)-$(VERSION)
AM_RECURSIVE_TARGETS += distdir
endif %?SUBDIRS%
-distdir: $(DISTFILES)
+distdir: $(am__dist_files)
##
## For Gnits users, this is pretty handy. Look at 15 lines
## in case some explanatory text is desirable.
## There are situations in which 'ln' can fail. For instance a file to
## distribute could actually be a cross-filesystem symlink -- this can
## easily happen if "gettextize" was run on the distribution.
- @lst='$(am__dist_files)'; for file in $$lst; do \
+ @lst='$(am__dist_files_cooked)'; for file in $$lst; do \
## Always look for the file or directory to distribute in the build
## directory first, in VPATH spirit.
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
fi; \
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
-## Test for file existence because sometimes:
-## - a file gets included in DISTFILES twice (for example, this happens
-## when a single source file is used in building more than one
-## program), or
-## - a single auxiliary file is distributed from several Makefiles at
-## once (see automake bug#9546 and bug#9651, and the follow-up commits
-## v1.11-1219-g326ecba, v1.11-1220-g851b1ae and v1.11-1221-gdccae6a).
-## See also test 'dist-repeated.test'.
+## Test for file existence because sometimes a single auxiliary file
+## is distributed from several Makefiles at once (see automake bug#9546
+## and bug#9651, and the follow-up commits 'v1.11-1219-g326ecba',
+## 'v1.11-1220-g851b1ae' and 'v1.11-1221-gdccae6a'). See also test
+## 't/dist-repeated.sh'.
test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
## -------------- ##
if %?DIST%
-DIST_COMMON += %DISTVAR%
+am__dist_common += %DISTVAR%
endif %?DIST%
## -------------- ##
if %?DIST%
-DIST_COMMON += %DISTVAR%
+am__dist_common += %DISTVAR%
endif %?DIST%
## -------------- ##
if %?DIST%
-DIST_COMMON += %DISTVAR%
+am__dist_common += %DISTVAR%
endif %?DIST%
## -------------- ##
if %?DIST%
-DIST_COMMON += %DISTVAR%
+am__dist_common += %DISTVAR%
endif %?DIST%
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
-DIST_COMMON += %VTEXI% %STAMPVTI%
+am__dist_common += %VTEXI% %STAMPVTI%
## Don't give this rule a command (even '@:').
## %STAMPVTI% is always newer than %VTEXI%, so this rule is always
xdefs = $(srcdir)/defs $(srcdir)/defs-static.in
ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
+pms := $(dist_perllib_DATA)
# Some simple checks, and then ordinary check. These are only really
# guaranteed to work on my machine.
sc_tests_make_dont_do_useless_vpath_rebuilds \
sc_no_dotmake_target \
sc_no_am_makeflags \
+sc_no_DISTFILES \
+sc_no_DIST_COMMON \
+sc_no_DIST_SOURCES \
sc_tests_no_make_e \
sc_docs_no_make_e \
sc_make_simple_include \
exit 1; \
fi
+# Modern names for internal variables that had a bad name once.
+modern_DISTFILES = am__dist_files
+modern_DIST_COMMON = am__dist_common
+modern_DIST_SOURCES = am__dist_sources
+
+sc_no_DISTFILES sc_no_DIST_COMMON sc_no_DIST_SOURCES: sc_no_% :
+ @files="\
+ $(xtests) \
+ $(pms) \
+ $(ams) \
+ $(srcdir)/automake.in \
+ $(srcdir)/doc/*.texi \
+ "; \
+ if grep -F '$*' $$files; then \
+ echo "'\$$($*)' is obsolete and no more used." >&2; \
+ echo "You should use '$(modern_$*)' instead." >&2; \
+ exit 1; \
+ fi
+
## "make -e" is brittle and unsafe, since it let *all* the environment
## win over the macro definitions in the Makefiles. We needed it when
## we couldn't assume GNU make, but now that the tide has turned, it's
acconfig.h:
echo target $@ should not be built >&2; exit 1
check-local:
- echo $(DISTFILES) | grep 'acconfig\.h' && exit 1; :
- echo $(DIST_COMMON) | grep 'acconfig\.h' && exit 1; :
+ echo $(am__dist_common) $(am__dist_files) \
+ | grep 'acconfig\.h' && exit 1; :
END
: > sub/acconfig.h
.PHONY: test
test: distdir
ls -l $(distdir)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]acconfig\.h '
test -f $(distdir)/acconfig.h
END
test: distdir
ls -l $(distdir)
test ! -f $(distdir)/aclocal.m4
- echo $(DISTFILES) | grep 'aclocal\.m4' && exit 1; :
- echo $(DIST_COMMON) | grep 'aclocal\.m4' && exit 1; :
+ echo $(am__dist_files) $(am__dist_common) \
+ | grep 'aclocal\.m4' && exit 1; :
check-local: test
END
.PHONY: test
test: distdir
ls -l $(distdir) $(distdir)/sub
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config\.h\.bot '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config\.h\.top '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]cfg2\.h\.bot '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]cfg2\.h\.top '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]sub/config\.h\.bot '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]sub/config\.h\.top '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]config\.h\.bot '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]config\.h\.top '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]cfg2\.h\.bot '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]cfg2\.h\.top '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]sub/config\.h\.bot '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]sub/config\.h\.top '
test -f $(distdir)/config.h.bot
test -f $(distdir)/config.h.top
test -f $(distdir)/cfg2.h.bot
configure.in:
$(dontbuild)
check-local:
- echo $(DISTFILES) | grep 'configure' && exit 1; :
- echo $(DIST_COMMON) | grep 'configure' && exit 1; :
+ echo $(am__dist_files) $(am__dist_common) \
+ | grep 'configure' && exit 1; :
END
: > sub/configure.ac
.PHONY: test
test: all distdir
ls -l $(distdir)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]stamp-vti '
test -f $(distdir)/stamp-vti
END
SUBDIRS = sub
check-local:
## For debugging.
- @echo DIST_COMMON:
- @for f in $(DIST_COMMON); do echo " $$f"; done
+ @echo am__dist_common:
+ @for f in $(am__dist_common); do echo " $$f"; done
@echo DISTDIR:
@ls -l $(distdir) | sed 's/^/ /'
## Now the checks.
include distfiles.am
check-local:
## For debugging.
- @echo DIST_COMMON:
- @for f in $(DIST_COMMON); do echo " $$f"; done
+ @echo am__dist_common:
+ @for f in $(am__dist_common); do echo " $$f"; done
@echo DISTDIR:
@ls -l $(distdir) | sed 's/^/ /'
## Now the checks.
## Some filenames might contain dots, but this won't cause spurious
## failures, and "spurious successes" are so unlikely that they're
## not worth worrying about.
- echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
+ echo ' ' $(am__dist_common) ' ' | grep "[ /]$$f " >/dev/null \
|| { echo $$f: distcom fail >&2; exit 1; }; \
done
END
include distfiles.am
check-local:
## For debugging.
- @echo DIST_COMMON:
- @for f in $(DIST_COMMON); do echo " $$f"; done
+ @echo am__dist_common:
+ @for f in $(am__dist_common); do echo " $$f"; done
@echo DISTDIR:
@ls -l $(distdir) | sed 's/^/ /'
## Now the checks.
## Some filenames might contain dots, but this won't cause spurious
## failures, and "spurious successes" are so unlikely that they're
## not worth worrying about.
- echo ' ' $(DIST_COMMON) ' ' | grep "[ /]$$f " >/dev/null \
+ echo ' ' $(am__dist_common) ' ' | grep "[ /]$$f " >/dev/null \
|| { echo $$f: distcom fail >&2; exit 1; }; \
done
END
grep '=GrEp$(empty)Me_am=' Makefile
grep '=GrEp$(empty)Me_dep=' Makefile
test-distcommon:
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]Makefile.dep '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]Makefile.dep '
test-distdir: distdir
test -f $(distdir)/Makefile.dep
END
: > Makefile.am
: > subdir/foo
cat > subdir/Makefile.am << 'END'
-# DIST_COMMON should contain 'foo', not 'subdir/foo'.
+# am__dist_common should contain 'foo', not 'subdir/foo'.
test:
- case '$(DIST_COMMON)' in *subdir/foo*) exit 1;; *) exit 0;; esac
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]foo '
+ case '$(am__dist_common)' in *subdir/foo*) exit 1;; *) exit 0;; esac
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]foo '
.PHONY: test
END
cat > Makefile.am << 'END'
.PHONY: test1 test2
test1:
- @echo DIST_COMMON = $(DIST_COMMON)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
+ @echo am__dist_common = $(am__dist_common)
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]acconfig\.h '
test2: distdir
ls -l $(distdir)/*
test -f $(distdir)/acconfig.h
cat > Makefile.am << 'END'
.PHONY: test0 test1 test2
test0:
- @echo DIST_COMMON = $(DIST_COMMON)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]one\.h\.in '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]two\.h\.in '
+ @echo am__dist_common = $(am__dist_common)
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]one\.h\.in '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]two\.h\.in '
: Processed header files should not be distributed.
- if echo ' ' $(DIST_COMMON) ' ' | grep '\.h '; then \
+ if echo ' ' $(am__dist_common) ' ' | grep '\.h '; then \
exit 1; \
else \
exit 0; \
check-local: test1 test2
.PHONY: test1 test2
test1:
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]config/depcomp '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]config/depcomp '
test2: distdir
ls -l $(distdir)/*
test -f $(distdir)/config/depcomp
SUBDIRS = subdir
test: distdir
ls -l $(distdir) $(distdir)/* ;: For debugging.
- @echo DIST_COMMON = $(DIST_COMMON) ;: Likewise.
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)foo.txt '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)bar.sh '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]$(auxdir)zardoz '
+ @echo am__dist_common = $(am__dist_common) ;: Likewise.
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]$(auxdir)foo.txt '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]$(auxdir)bar.sh '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]$(auxdir)zardoz '
test -f $(distdir)/$(auxdir)foo.txt
test -f $(distdir)/$(auxdir)bar.sh
test -f $(distdir)/$(auxdir)zardoz
# FIXME: 'distcom*.test' files should be factored out in a common
# FIXME: subroutine in 'defs'...
sed -n -e "
- /^DIST_COMMON =.*\\\\$/ {
+ /^am__dist_common =.*\\\\$/ {
:loop
p
n
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure that depcomp and compile are added to DIST_COMMON.
+# Test to make sure that depcomp and compile are added to am__dist_common.
# Report from Pavel Roskin. Report of problems with '--no-force' from
# Scott James Remnant (Debian #206299)
# FIXME: 'distcom*.test' files should be factored out in a common
# FIXME: subroutine in 'defs'...
sed -n -e "
- /^DIST_COMMON =.*\\\\$/ {
+ /^am__dist_common =.*\\\\$/ {
:loop
p
n
cat subdir/dc.txt # Likewise.
$FGREP ' $(top_srcdir)/depcomp ' subdir/dc.txt
- # The 'compile' script will be listed in the DIST_COMMON of the top-level
+ # The 'compile' script will be listed in the am__dist_common of the top-level
# Makefile because it's required in configure.ac (by AM_PROG_CC_C_O).
$FGREP ' $(top_srcdir)/compile ' dc.txt || $FGREP ' compile ' dc.txt
cat output
grep README output && Exit 1
-sed -n -e '/^DIST_COMMON =.*\\$/ {
+sed -n -e '/^am__dist_common =.*\\$/ {
:loop
p
n
t loop
p
n
- }' -e '/^DIST_COMMON =/ p' Makefile.in | grep README
+ }' -e '/^am__dist_common =/ p' Makefile.in | grep README
# Should warn about missing README.
cat > Makefile.am << 'END'
.PHONY: test1 test 2
test1:
- for x in $(DISTFILES); do echo $$x; done | grep 'tests/' > lst
+ for x in $(am__dist_files); do echo $$x; done \
+ | grep 'tests/' > lst
cat lst # For debugging.
test `wc -l <lst` -eq 1
test2: distdir
test: distdir
test -f $(distdir)/tests/wrapper.in
check-local: test
- for x in $(DISTFILES); do echo $$x; done \
+ for x in $(am__dist_files); do echo $$x; done \
| grep tests && exit 1; :
END
cat > tests/Makefile.am <<'END'
check-local:
- for x in $(DISTFILES); do echo $$x; done | grep wrapper.in > lst
+ for x in $(am__dist_files); do echo $$x; done \
+ | grep wrapper.in > lst
cat lst # For debugging.
test `wc -l <lst` -eq 1
END
# sure *srcdir is properly handled. Note that using './', as in
# EXTRA_DIST = ./joe
# does not work portably: it fails with HP-UX and Tru64 make.
-# Also test DISTFILES containing a directory and a file in it,
-# and repeated directories.
+# Also test the situation when the lsit of distributed files contains
+# a directory and a file in it, and repeated directories.
. ./defs || Exit 1
test $len -eq 1
# Also make sure include file is distributed.
-sed -n -e '/^DIST_COMMON =.*\\$/ {
+sed -n -e '/^am__dist_common =.*\\$/ {
:loop
p
n
t loop
p
n
- }' -e '/^DIST_COMMON =/ p' Makefile.in | grep Will_Be_Included_In_Makefile
+ }' -e '/^am__dist_common =/ p' Makefile.in | grep Will_Be_Included_In_Makefile
:
.PHONY: test
test: distdir
find $(distdir) ;: For debugging.
- echo ' ' $(DISTFILES) ' ' | grep '[ /]install-sh '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]install-sh '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]install-sh '
test -f $(distdir)/install-sh
END
test1: all
$(AR) tv libtu.a
test2:
- @echo DIST_COMMON = $(DIST_COMMON)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]basename\.c '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]dirname\.c '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]am__dummy_function\.c '
+ @echo am__dist_common = $(am__dist_common)
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]basename\.c '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]dirname\.c '
+ echo ' ' $(am__dist_common) ' ' | grep '[ /]am__dummy_function\.c '
test3: distdir
test -f $(distdir)/basename.c
test -f $(distdir)/dirname.c
$AUTOMAKE
grep '^am_eyeball_OBJECTS' Makefile.in
-grep '^DIST_SOURCES =' Makefile.in
-grep '^DIST_SOURCES =.*nodist' Makefile.in && Exit 1
+grep '^am__dist_sources =' Makefile.in
+grep '^am__dist_sources =.*nodist' Makefile.in && Exit 1
:
$AUTOMAKE
grep '^dist:' Makefile.in && Exit 1
-grep '^DIST_SOURCES =' Makefile.in && Exit 1
+grep 'am__dist_sources' Makefile.in && Exit 1
:
# like the following (among the Makefiles)
# README.foo:templ/README.foo.in
# the generated dist target in the Makefile.in fails,
-# because DIST_COMMON will contain templ/README.foo.in
+# because am__dist_common will contain templ/README.foo.in
# and the dist target will try to copy templ/README.foo.in
# to the distribution directory before it creates a templ
# subdirectory in the distribution directory.
$AUTOMAKE --gnu
# Make sure that depcomp is *not* included in the definition
-# of DIST_COMMON in lib/Makefile.in. If you change this test
-# so that more files are included in lib's DIST_COMMON definition,
+# of am__dist_common in lib/Makefile.in. If you change this test
+# so that more files are included in lib's am__dist_common definition,
# then you must handle the case in which depcomp is listed on a
# continued line.
-grep '^DIST_COMMON.*depcomp' lib/Makefile.in && Exit 1
+grep '^am__dist_common.*depcomp' lib/Makefile.in && Exit 1
:
# This is unrelated to the rest of this test. But while we are
# at it, make sure we don't use am__helldl_SOURCES_DIST here, since
-# it's not needed. DIST_SOURCES should contain $(helldl_SOURCES).
+# it's not needed. am__dist_sources should contain $(helldl_SOURCES).
grep am__helldl_SOURCES_DIST Makefile && Exit 1
-grep 'DIST_SOURCES.*\$(helldl_SOURCES)' Makefile
+grep 'am__dist_sources.*\$(helldl_SOURCES)' Makefile
:
AUTOMAKE_OPTIONS = $am_opts
check-local: test-sub
test-sub:
- echo ' ' \$(DIST_COMMON) ' ' | grep '[ /]$test_driver '
+ echo ' ' \$(am__dist_common) ' ' | grep '[ /]$test_driver '
TESTS = foo.test
EXTRA_DIST = \$(TESTS)
END
info_TEXINFOS = textutils.texi
.PHONY: test1 test2
test1:
- @echo DISTFILES = $(DISTFILES)
- echo ' ' $(DISTFILES) ' ' | grep '[ /]texinfo\.tex '
+ @echo am__dist_files = $(am__dist_files)
+ echo ' ' $(am__dist_files) ' ' | grep '[ /]texinfo\.tex '
test2: distdir
ls -l $(distdir)
test -f $(distdir)/texinfo.tex
info_TEXINFOS = textutils.texi
.PHONY: test
test:
- @echo DISTFILES = $(DISTFILES)
- case '$(DISTFILES)' in *'~'*) exit 1;; *) exit 0;; esac
+ @echo am__dist_files = $(am__dist_files)
+ case '$(am__dist_files)' in *'~'*) exit 1;; *) exit 0;; esac
END
: > texinfo.tex
info_TEXINFOS = textutils.texi
.PHONY: test1 test2
test1:
- @echo DISTFILES = $(DISTFILES)
- echo ' ' $(DISTFILES) ' ' | grep '[ /]auxdir/texinfo\.tex '
+ @echo am__dist_files = $(am__dist_files)
+ echo ' ' $(am__dist_files) ' ' | grep '[ /]auxdir/texinfo\.tex '
test2: distdir
ls -l $(distdir)/*
test -f $(distdir)/auxdir/texinfo.tex
info_TEXINFOS = foobar.texi quux.texi zardoz.texi
.PHONY: echo-distfiles
echo-distfiles:
- @echo ' ' $(DISTFILES) ' '
+ @echo ' ' $(am__dist_files) ' '
END
cat > foobar.texi << 'END'
vmonth=`grep '^@set UPDATED ' $srcdir/$vfile.texi | awk '{print $4, $5}'`
grep "^@set UPDATED-MONTH $vmonth$" $srcdir/$vfile.texi
# Check that the vers*.texi file is distributed according
- # to $(DISTFILES).
+ # to $(am__dist_files).
$MAKE echo-distfiles # For debugging.
$MAKE -s echo-distfiles | grep "[ /]$vfile\\.texi"
}
cat $(srcdir)/foo.info | grep 'GREPDATE=$(my_date_rx)='
cat $(srcdir)/foo.info | grep 'GREPMONTH=$(my_month_rx)='
test-distfiles:
- @echo DISTFILES = $(DISTFILES)
- echo ' ' $(DISTFILES) ' ' | grep '[ /]version.texi '
+ @echo am__dist_files = $(am__dist_files)
+ echo ' ' $(am__dist_files) ' ' | grep '[ /]version.texi '
test-distdir: distdir
ls -l $(distdir)
diff $(srcdir)/version.texi $(distdir)/version.texi
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(DIST_COMMON) ' '
+ @echo ' ' $(am__dist_common) ' '
END
cat > parse.y << 'END'
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(DIST_COMMON) ' '
+ @echo ' ' $(am__dist_common) ' '
END
cat > parse1.yy << 'END'
zardoz_SOURCES = parse.y main.c
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(DIST_COMMON) ' '
+ @echo ' ' $(am__dist_common) ' '
END
cp foo/Makefile.am bar/Makefile.am
cp foo/Makefile.am baz/Makefile.am
cat > Makefile.am <<'END'
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(DIST_COMMON) ' '
+ @echo ' ' $(am__dist_common) ' '
END
cp Makefile.am foo/Makefile.am
cp Makefile.am bar/Makefile.am
projects / thirdparty / automake.git / commitdiff
