From 07f2666b91c0083a36135c9893305b2a620e3b38 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 19 Oct 2013 12:22:36 -0400 Subject: * maintMakefile (checkcfg.%): Add testing of build.sh --- .gitignore | 1 + maintMakefile | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 24db930..6e3f5a2 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ config.h.W32 configh.dos make-[0-9]*/ make-[0-9]*.tar.* +checkcfg.*.log diff --git a/maintMakefile b/maintMakefile index f8bb678..cacab4c 100644 --- a/maintMakefile +++ b/maintMakefile @@ -230,16 +230,22 @@ check-alt-config: \ checkcfg.CPPFLAGS^-DNO_OUTPUT_SYNC \ checkcfg.CPPFLAGS^-DNO_ARCHIVES +NR_MAKE = $(MAKE) + +# Check builds both with build.sh and with make checkcfg.%: distdir - @ rm -rf $(distdir)/_build \ + @( rm -rf $(distdir)/_build \ && mkdir $(distdir)/_build \ && cd $(distdir)/_build \ && echo "Testing configure with $(subst ^,=,$*)" \ && ../configure --srcdir=.. $(subst ^,=,$*) \ $(AM_DISTCHECK_CONFIGURE_FLAGS) $(DISTCHECK_CONFIGURE_FLAGS) \ CFLAGS='$(AM_CFLAGS)' \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) check + && ./build.sh \ + && ./make $(AM_MAKEFLAGS) check \ + && rm -f *.o make \ + && $(NR_MAKE) $(AM_MAKEFLAGS) \ + && ./make $(AM_MAKEFLAGS) check ) 2>&1 | tee checkcfg.$*.log ## --------------- ## -- cgit v1.2.3