From a18490b73db83131d17f52c979a47c243a697785 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 3 Nov 2000 20:27:40 +0000 Subject: [PATCH] Add global .SECONDARY: target to not allow make to delete intermediate target files in implicit rule chains. That might have been a cool idea but it seems to be too buggy to work, as it caused spurious recompiles in several places. --- src/Makefile.global.in | 6 +++++- src/pl/tcl/Makefile | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 3f3e9d6100..fde70c25f9 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.107 2000/10/29 16:13:28 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.108 2000/11/03 20:27:40 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -28,6 +28,10 @@ all: # started to update the file. .DELETE_ON_ERROR: +# Do not let 'make' delete intermediate files. This might have been +# a sensible idea, but it's too buggy. +.SECONDARY: + # PostgreSQL version number VERSION = @VERSION@ diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 62a11f74f5..33e7b39816 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.24 2000/10/20 21:04:17 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.25 2000/11/03 20:27:40 petere Exp $ # #------------------------------------------------------------------------- @@ -87,10 +87,6 @@ ifdef EXPSUFF INFILES+= $(DLOBJS:.o=$(EXPSUFF)) endif -# Prevent removal of pltcl.o, being an intermediate file. This would -# not be wrong in general, but for some reason the next make run will -# not realize this and rebuild it. -.SECONDARY: pltcl.o # Provide dummy targets for the case where we can't build the shared library. @@ -119,4 +115,4 @@ Makefile.tcldefs: mkMakefile.tcldefs.sh $(SHELL) $< '$(TCL_CONFIG_SH)' '$@' clean distclean maintainer-clean: - rm -f $(INFILES) *.o Makefile.tcldefs + rm -f $(INFILES) pltcl.o Makefile.tcldefs