diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | Makefile.in | 10 |
3 files changed, 24 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2015-10-16 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (SUBDIRS): Fix ordering so that + make check directly after configure works properly. + Thanks to Michal Jaegermann <michal.jnn@gmail.com> + for the report. + 2015-10-11 Arnold D. Robbins <arnold@skeeve.com> * awkgram.y (yylex): Fix invalid read problems. diff --git a/Makefile.am b/Makefile.am index 342df292..460f9114 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,21 +59,24 @@ EXTRA_DIST = \ ylwrap # The order to do things in. +# # Build explicitly in "." in order to build gawk first, so # that `make check' without a prior `make' works. +# +# Build in extension before test so that +# ./configure && make check +# works properly too. +# # Build in awklib after in doc, since we want to extract # sample files if doc/gawk.texi changed. -SUBDIRS = \ - . \ - doc \ - awklib \ - po \ - test +SUBDIRS = . if ENABLE_EXTENSIONS SUBDIRS += extension endif +SUBDIRS += doc awklib po test + # what to make and install bin_PROGRAMS = gawk include_HEADERS = gawkapi.h diff --git a/Makefile.in b/Makefile.in index 08f434c1..1fb71a75 100644 --- a/Makefile.in +++ b/Makefile.in @@ -262,7 +262,7 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = . doc awklib po test extension +DIST_SUBDIRS = . extension doc awklib po test am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configh.in ABOUT-NLS \ AUTHORS COPYING ChangeLog INSTALL NEWS README awkgram.c \ command.c compile config.guess config.rpath config.sub depcomp \ @@ -477,11 +477,17 @@ EXTRA_DIST = \ # The order to do things in. +# # Build explicitly in "." in order to build gawk first, so # that `make check' without a prior `make' works. +# +# Build in extension before test so that +# ./configure && make check +# works properly too. +# # Build in awklib after in doc, since we want to extract # sample files if doc/gawk.texi changed. -SUBDIRS = . doc awklib po test $(am__append_1) +SUBDIRS = . $(am__append_1) doc awklib po test include_HEADERS = gawkapi.h # sources for both gawk and dgawk |