diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-10-04 11:05:13 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-10-04 11:05:13 +0300 |
| commit | 8111eca142100dd5a9e9fc11a29e750b0ccbe31a (patch) | |
| tree | 31b600703dc306cc095359fc900ebb78691a0fbe /test | |
| parent | 6d5c1e1d38f71fdfc1794b5b3723a6e476ffddf4 (diff) | |
| parent | 97c4e427ab48d4e45889ca74abb0701a049d7606 (diff) | |
| download | egawk-8111eca142100dd5a9e9fc11a29e750b0ccbe31a.tar.gz egawk-8111eca142100dd5a9e9fc11a29e750b0ccbe31a.tar.bz2 egawk-8111eca142100dd5a9e9fc11a29e750b0ccbe31a.zip | |
Merge branch 'feature/zOS-try2' into gawk-4.1-stable
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 8 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 26 |
3 files changed, 25 insertions, 15 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 8a227232..2199f56c 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -12,6 +12,14 @@ * profile.ok: Updated after code change. +2015-08-28 Daniel Richard G. <skunk@iSKUNK.ORG> + + * 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 <arnold@skeeve.com> * mbstr1.ok: Updated after code change. diff --git a/test/Makefile.am b/test/Makefile.am index 27ccb76a..56fd5da9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2099,11 +2099,11 @@ muldimposix:: # 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 787fba15..7963cfbb 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1498,7 +1498,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 @@ -1564,14 +1566,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 @@ -3954,11 +3956,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 |