From 680e658f58e9bf7786800668725ff59a1963b793 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 28 Oct 2013 18:49:08 -0700 Subject: * Makefile (clean): depends on conftest.clean (conftest.clean): New target. * configure: Use "make conftest.clean" to clean up conftest stuff. Note that there was a bug here: brace expansion was used, but the shell is /bin/sh, so conftest.err wasn't being removed. --- ChangeLog | 9 +++++++++ Makefile | 8 +++++++- configure | 3 +-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2142e02..6f98e63e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-10-28 Kaz Kylheku + + * Makefile (clean): depends on conftest.clean + (conftest.clean): New target. + + * configure: Use "make conftest.clean" to clean up conftest stuff. Note + that there was a bug here: brace expansion was used, but the shell is + /bin/sh, so conftest.err wasn't being removed. + 2013-10-27 Kaz Kylheku Fix 2013-10-06 regression in op syntax. This happens when a @var diff --git a/Makefile b/Makefile index 98ed9030..1c4644d1 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ $(MPI_OBJS): CFLAGS += -DXCALLOC=chk_calloc -DXFREE=free rebuild: clean repatch $(PROG) .PHONY: clean -clean: +clean: conftest.clean rm -f $(PROG) $(OBJS) $(OBJS-y) \ y.tab.c lex.yy.c y.tab.h y.output $(TESTS:.ok=.out) @@ -190,3 +190,9 @@ conftest.yacc: .PHONY: conftest.ccver conftest.ccver: @$(CC) --version + +.PHONY: conftest.clean +conftest.clean: + rm -f conftest conftest.[co] \ + conftest2 conftest[12].[oc] \ + conftest.err conftest.syms diff --git a/configure b/configure index dece3572..7ba40efb 100755 --- a/configure +++ b/configure @@ -1293,8 +1293,7 @@ fi # Clean up # -rm -f conftest conftest.[co] conftest.{err,syms} -rm -f conftest2 conftest[12].[oc] +make conftest.clean # # What do we have for patch management. -- cgit v1.2.3