From edc2856a2ae2dc46037f85652440bd329b1a2c8a Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 2 Aug 2015 21:41:40 +0300 Subject: Rework zOS patches; keep separate from autotools. --- test/Makefile.am | 6 +++--- test/Makefile.in | 26 ++++++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index 5e72014b..c499996c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2079,11 +2079,11 @@ negtime:: # Targets generated for other tests: include Maketests -$(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests +Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests files=`cd "$(srcdir)" && echo *.awk *.in`; \ - $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > "$(srcdir)"/Maketests + $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > $@ -clean: +clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ mmap8k.ok profile1.ok diff --git a/test/Makefile.in b/test/Makefile.in index 0116f3a4..e8f0109c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1489,7 +1489,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean-am: clean-generic mostlyclean-am +clean: clean-am + +clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -1555,14 +1557,14 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ - ctags-am distclean distclean-generic distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: all all-am check check-am clean clean-generic clean-local \ + cscopelist-am ctags-am distclean distclean-generic distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags-am uninstall uninstall-am @@ -3929,11 +3931,11 @@ time: # Targets generated for other tests: -$(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests +Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests files=`cd "$(srcdir)" && echo *.awk *.in`; \ - $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > "$(srcdir)"/Maketests + $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > $@ -clean: +clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ mmap8k.ok profile1.ok -- cgit v1.2.3 From d8ed23b4604a9366f9d532d614ab74943fb1748d Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Tue, 1 Sep 2015 06:00:19 +0300 Subject: ChangeLog entries for z/OS added. --- test/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index 7b9e273a..ba2856b6 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,11 @@ +2015-08-28 Daniel Richard G. + + * Makefile.am: Generate the Maketests file without + reference to its directory, because putting it directly into + srcdir can be problematic (e.g. srcdir could be read-only). + (clean-local): Renamed from "clean", as Automake already defines + "clean" and warns us as much. + 2015-08-25 Arnold D. Robbins * mbstr1.ok: Updated after code change. -- cgit v1.2.3