From: Akim Demaille Date: Mon, 5 Feb 2001 09:09:17 +0000 (+0000) Subject: * Makefile.am (perl4-check): Remove, we now require Perl 5. X-Git-Tag: v1.10.2~2273 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=491b77b46d7562a8bd92f93c54b86e1b0d9f2c2e;p=platform%2Fupstream%2Fautomake.git * Makefile.am (perl4-check): Remove, we now require Perl 5. (maintainer-check): Don't be silent when you find a problem, and actually, even specify the locations. Also check that @_ is assigned to arrays. --- diff --git a/ChangeLog b/ChangeLog index 36a7195..6156edb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-02-05 Akim Demaille + * Makefile.am (perl4-check): Remove, we now require Perl 5. + (maintainer-check): Don't be silent when you find a problem, and + actually, even specify the locations. + Also check that @_ is assigned to arrays. + +2001-02-05 Akim Demaille + * m4/regex.m4: Use AC_LIBSOURCES. * automake.in (scan_autoconf_traces): Trace AC_LIBSOURCE, not _AC_LIBOBJ_DECL. diff --git a/Makefile.am b/Makefile.am index d417b31..80d88e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,12 +58,6 @@ EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ## to anybody else ## -# Run the test suite using Perl 4. -perl4-check: automake aclocal - @if $(SHELL) -c 'perl4.036 -v' > /dev/null 2>&1; then \ - $(MAKE) PERL=perl4.036 check; \ - else :; fi - # Some simple checks, and then ordinary check. These are only really # guaranteed to work on my machine. maintainer-check: automake aclocal @@ -81,40 +75,44 @@ maintainer-check: automake aclocal ## expect no instances of '${...}'. However, $${...} is ok, since that ## is a shell construct, not a Makefile construct. ## The backslash in `$${' is needed for some versions of bash. - @if test `fgrep '\$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \ - echo "found too many uses of '\$${'" 1>&2; \ + @if fgrep '\$${' $(srcdir)/[a-z]*.am | \ + fgrep -v '$$$$' | \ + grep . ; then \ + echo "Found too many uses of '\$${' in the lines above." 1>&2; \ exit 1; \ else :; fi ## Make sure all invocations of mkinstalldirs are correct. - @if test `fgrep 'mkinstalldirs' $(srcdir)/[a-z]*.am | fgrep -v '$$(mkinstalldirs)' | wc -l` -ne 0; then \ - echo "found incorrect use of mkinstalldirs" 1>&2; \ + @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \ + fgrep -v '$$(mkinstalldirs)' | \ + grep . ; then \ + echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi -## Another syntax check, this time with Perl 4, if it exists. - @if $(SHELL) -c 'perl4.036 -v' >/dev/null 2>&1; then \ - perl4.036 -c -w automake; \ - perl4.036 -c -w aclocal; \ - else :; fi ## We never want to use "undef", only "delete". - @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \ + @if grep -n -w undef $(srcdir)/automake.in; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi ## We never want split (/ /,...), only split (' ', ...). - @if fgrep 'split (/ /' $(srcdir)/automake.in > /dev/null 2>&1; then \ - echo "Found bad split in automake.in" 1>&2; \ + @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \ + echo "Found bad split in the lines above." 1>&2; \ exit 1; \ fi ## Look for cd within backquotes without CDPATH=: - @if grep '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \ + @if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \ $(srcdir)/m4/*.m4; then \ echo "Consider setting CDPATH in the lines above" 1>&2; \ exit 1; \ fi +## Using @_ in a scalar context is most probably a programming error. + @if grep -Hn '[^) ] *= *@_' $(srcdir)/automake.in; then \ + echo "Using @_ in a scalar context in the lines above." 1>&2; \ + exit 1; \ + fi # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. -cvs-dist: maintainer-check perl4-check distcheck +cvs-dist: maintainer-check distcheck @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ diff --git a/Makefile.in b/Makefile.in index 9863740..bb82edb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_FLAG = +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : @@ -138,7 +139,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) @@ -148,9 +149,9 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) automake: $(top_builddir)/config.status automake.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status aclocal: $(top_builddir)/config.status aclocal.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @@ -512,6 +513,7 @@ distdir: $(DISTFILES) fi -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) + $(mkinstalldirs) $(distdir)/. . @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -636,12 +638,6 @@ installcheck-local: ################################################################ -# Run the test suite using Perl 4. -perl4-check: automake aclocal - @if $(SHELL) -c 'perl4.036 -v' > /dev/null 2>&1; then \ - $(MAKE) PERL=perl4.036 check; \ - else :; fi - # Some simple checks, and then ordinary check. These are only really # guaranteed to work on my machine. maintainer-check: automake aclocal @@ -652,35 +648,39 @@ maintainer-check: automake aclocal fi $(PERL) -c -w automake $(PERL) -c -w aclocal - @if test `fgrep '\$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \ - echo "found too many uses of '\$${'" 1>&2; \ + @if fgrep '\$${' $(srcdir)/[a-z]*.am | \ + fgrep -v '$$$$' | \ + grep . ; then \ + echo "Found too many uses of '\$${' in the lines above." 1>&2; \ exit 1; \ else :; fi - @if test `fgrep 'mkinstalldirs' $(srcdir)/[a-z]*.am | fgrep -v '$$(mkinstalldirs)' | wc -l` -ne 0; then \ - echo "found incorrect use of mkinstalldirs" 1>&2; \ + @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \ + fgrep -v '$$(mkinstalldirs)' | \ + grep . ; then \ + echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi - @if $(SHELL) -c 'perl4.036 -v' >/dev/null 2>&1; then \ - perl4.036 -c -w automake; \ - perl4.036 -c -w aclocal; \ - else :; fi - @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \ + @if grep -n -w undef $(srcdir)/automake.in; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi - @if fgrep 'split (/ /' $(srcdir)/automake.in > /dev/null 2>&1; then \ - echo "Found bad split in automake.in" 1>&2; \ + @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \ + echo "Found bad split in the lines above." 1>&2; \ exit 1; \ fi - @if grep '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \ + @if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \ $(srcdir)/m4/*.m4; then \ echo "Consider setting CDPATH in the lines above" 1>&2; \ exit 1; \ fi + @if grep -Hn '[^) ] *= *@_' $(srcdir)/automake.in; then \ + echo "Using @_ in a scalar context in the lines above." 1>&2; \ + exit 1; \ + fi # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. -cvs-dist: maintainer-check perl4-check distcheck +cvs-dist: maintainer-check distcheck @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index d417b31..80d88e9 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -58,12 +58,6 @@ EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ## to anybody else ## -# Run the test suite using Perl 4. -perl4-check: automake aclocal - @if $(SHELL) -c 'perl4.036 -v' > /dev/null 2>&1; then \ - $(MAKE) PERL=perl4.036 check; \ - else :; fi - # Some simple checks, and then ordinary check. These are only really # guaranteed to work on my machine. maintainer-check: automake aclocal @@ -81,40 +75,44 @@ maintainer-check: automake aclocal ## expect no instances of '${...}'. However, $${...} is ok, since that ## is a shell construct, not a Makefile construct. ## The backslash in `$${' is needed for some versions of bash. - @if test `fgrep '\$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \ - echo "found too many uses of '\$${'" 1>&2; \ + @if fgrep '\$${' $(srcdir)/[a-z]*.am | \ + fgrep -v '$$$$' | \ + grep . ; then \ + echo "Found too many uses of '\$${' in the lines above." 1>&2; \ exit 1; \ else :; fi ## Make sure all invocations of mkinstalldirs are correct. - @if test `fgrep 'mkinstalldirs' $(srcdir)/[a-z]*.am | fgrep -v '$$(mkinstalldirs)' | wc -l` -ne 0; then \ - echo "found incorrect use of mkinstalldirs" 1>&2; \ + @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \ + fgrep -v '$$(mkinstalldirs)' | \ + grep . ; then \ + echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \ exit 1; \ else :; fi -## Another syntax check, this time with Perl 4, if it exists. - @if $(SHELL) -c 'perl4.036 -v' >/dev/null 2>&1; then \ - perl4.036 -c -w automake; \ - perl4.036 -c -w aclocal; \ - else :; fi ## We never want to use "undef", only "delete". - @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \ + @if grep -n -w undef $(srcdir)/automake.in; then \ echo "Found undef in automake.in; use delete instead" 1>&2; \ exit 1; \ fi ## We never want split (/ /,...), only split (' ', ...). - @if fgrep 'split (/ /' $(srcdir)/automake.in > /dev/null 2>&1; then \ - echo "Found bad split in automake.in" 1>&2; \ + @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \ + echo "Found bad split in the lines above." 1>&2; \ exit 1; \ fi ## Look for cd within backquotes without CDPATH=: - @if grep '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \ + @if grep -n '` *cd ' $(srcdir)/automake.in $(srcdir)/*.am \ $(srcdir)/m4/*.m4; then \ echo "Consider setting CDPATH in the lines above" 1>&2; \ exit 1; \ fi +## Using @_ in a scalar context is most probably a programming error. + @if grep -Hn '[^) ] *= *@_' $(srcdir)/automake.in; then \ + echo "Using @_ in a scalar context in the lines above." 1>&2; \ + exit 1; \ + fi # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. -cvs-dist: maintainer-check perl4-check distcheck +cvs-dist: maintainer-check distcheck @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ diff --git a/tests/Makefile.in b/tests/Makefile.in index e847f64..79c7f12 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_FLAG = +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : @@ -357,7 +358,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= CONFIG_COMMANDS= $(SHELL) ./config.status tags: TAGS TAGS: