Fix failure to relink postmaster executable in the first make run if only a

petere · petere · commit f1d820494c6f · 2002-08-10T17:59:28.000Z
single source file a few directories deep in the backend tree has changed.
diff --git a/src/backend/Makefile b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.83 2002/08/08 07:47:42 ishii Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.84 2002/08/10 17:59:28 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -53,7 +53,7 @@ endif # win
 
 
 # Parallel make trickery
-$(OBJS): $(DIRS:%=%-recursive)
+$(OBJS): $(DIRS:%=%-recursive) ;
 
 .PHONY: $(DIRS:%=%-recursive)
 # Update the commonly used headers before building the subdirectories
diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the access methods module
 #
-# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.7 2000/08/31 16:09:26 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.8 2002/08/10 17:59:28 petere Exp $
 #
 
 subdir = src/backend/access
@@ -16,7 +16,7 @@ all: SUBSYS.o
 SUBSYS.o: $(SUBDIROBJS)
 	$(LD) $(LDREL) $(LDOUT) $@ $^
 
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)
+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
 
 .PHONY: $(SUBDIRS:%=%-recursive)
 $(SUBDIRS:%=%-recursive):
diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for optimizer
 #
-# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.9 2000/08/31 16:10:07 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.10 2002/08/10 17:59:28 petere Exp $
 #
 
 subdir = src/backend/optimizer
@@ -16,7 +16,7 @@ all: SUBSYS.o
 SUBSYS.o: $(SUBDIROBJS)
 	$(LD) $(LDREL) $(LDOUT) $@ $^
 
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)
+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
 
 .PHONY: $(SUBDIRS:%=%-recursive)
 $(SUBDIRS:%=%-recursive):
diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the storage manager subsystem
 #
-# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.9 2001/06/27 23:31:39 tgl Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.10 2002/08/10 17:59:28 petere Exp $
 #
 
 subdir = src/backend/storage
@@ -16,7 +16,7 @@ all: SUBSYS.o
 SUBSYS.o: $(SUBDIROBJS)
 	$(LD) $(LDREL) $(LDOUT) $@ $^
 
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)
+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
 
 .PHONY: $(SUBDIRS:%=%-recursive)
 $(SUBDIRS:%=%-recursive):
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for utils
 #
-# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.18 2000/08/31 16:10:42 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.19 2002/08/10 17:59:28 petere Exp $
 #
 
 subdir = src/backend/utils/
@@ -20,7 +20,7 @@ all: SUBSYS.o fmgroids.h
 SUBSYS.o: fmgrtab.o $(SUBDIROBJS)
 	$(LD) $(LDREL) $(LDOUT) $@ $^
 
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)
+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
 
 .PHONY: $(SUBDIRS:%=%-recursive)
 $(SUBDIRS:%=%-recursive): fmgroids.h

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.83 2002/08/08 07:47:42 ishii Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.84 2002/08/10 17:59:28 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -53,7 +53,7 @@ endif # win`
`53`	`53`
`54`	`54`
`55`	`55`	`# Parallel make trickery`
`56`		`-$(OBJS): $(DIRS:%=%-recursive)`
	`56`	`+$(OBJS): $(DIRS:%=%-recursive) ;`
`57`	`57`
`58`	`58`	`.PHONY: $(DIRS:%=%-recursive)`
`59`	`59`	`# Update the commonly used headers before building the subdirectories`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Makefile for the access methods module`
`3`	`3`	`#`
`4`		`-# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.7 2000/08/31 16:09:26 petere Exp $`
	`4`	`+# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.8 2002/08/10 17:59:28 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`subdir = src/backend/access`
`@@ -16,7 +16,7 @@ all: SUBSYS.o`
`16`	`16`	`SUBSYS.o: $(SUBDIROBJS)`
`17`	`17`	`$(LD) $(LDREL) $(LDOUT) $@ $^`
`18`	`18`
`19`		`-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)`
	`19`	`+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;`
`20`	`20`
`21`	`21`	`.PHONY: $(SUBDIRS:%=%-recursive)`
`22`	`22`	`$(SUBDIRS:%=%-recursive):`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Makefile for optimizer`
`3`	`3`	`#`
`4`		`-# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.9 2000/08/31 16:10:07 petere Exp $`
	`4`	`+# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.10 2002/08/10 17:59:28 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`subdir = src/backend/optimizer`
`@@ -16,7 +16,7 @@ all: SUBSYS.o`
`16`	`16`	`SUBSYS.o: $(SUBDIROBJS)`
`17`	`17`	`$(LD) $(LDREL) $(LDOUT) $@ $^`
`18`	`18`
`19`		`-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)`
	`19`	`+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;`
`20`	`20`
`21`	`21`	`.PHONY: $(SUBDIRS:%=%-recursive)`
`22`	`22`	`$(SUBDIRS:%=%-recursive):`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Makefile for the storage manager subsystem`
`3`	`3`	`#`
`4`		`-# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.9 2001/06/27 23:31:39 tgl Exp $`
	`4`	`+# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.10 2002/08/10 17:59:28 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`subdir = src/backend/storage`
`@@ -16,7 +16,7 @@ all: SUBSYS.o`
`16`	`16`	`SUBSYS.o: $(SUBDIROBJS)`
`17`	`17`	`$(LD) $(LDREL) $(LDOUT) $@ $^`
`18`	`18`
`19`		`-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)`
	`19`	`+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;`
`20`	`20`
`21`	`21`	`.PHONY: $(SUBDIRS:%=%-recursive)`
`22`	`22`	`$(SUBDIRS:%=%-recursive):`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# Makefile for utils`
`3`	`3`	`#`
`4`		`-# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.18 2000/08/31 16:10:42 petere Exp $`
	`4`	`+# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.19 2002/08/10 17:59:28 petere Exp $`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`subdir = src/backend/utils/`
`@@ -20,7 +20,7 @@ all: SUBSYS.o fmgroids.h`
`20`	`20`	`SUBSYS.o: fmgrtab.o $(SUBDIROBJS)`
`21`	`21`	`$(LD) $(LDREL) $(LDOUT) $@ $^`
`22`	`22`
`23`		`-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)`
	`23`	`+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;`
`24`	`24`
`25`	`25`	`.PHONY: $(SUBDIRS:%=%-recursive)`
`26`	`26`	`$(SUBDIRS:%=%-recursive): fmgroids.h`