Commit08029fa

Bryan Henderson

committed

Recognize dependencies more reliably.

1 parentaaeef4d commit08029faCopy full SHA for 08029fa

File tree

+40

-24

lines changed

+40

-24

lines changed

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,21 @@`
`4`	`4`	`# Makefile for the access methods module`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.1 1996/10/27 09:45:42 bryanh Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.2 1996/11/10 03:11:46 bryanh Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`		`-all: SUBSYS.o`
	`11`	`+OBJS = common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o\`
	`12`	`+ index/SUBSYS.o rtree/SUBSYS.o nbtree/SUBSYS.o transam/SUBSYS.o`
`12`	`13`
`13`		`-SUBSYS.o:`
	`14`	`+`
	`15`	`+all: submake SUBSYS.o`
	`16`	`+`
	`17`	`+SUBSYS.o:$(OBJS)`
	`18`	`+$(LD) -r -o SUBSYS.o$(OBJS)`
	`19`	`+`
	`20`	`+.PHONY: submake`
	`21`	`+submake:`
`14`	`22`	`$(MAKE) -C common SUBSYS.o`
`15`	`23`	`$(MAKE) -C gist SUBSYS.o`
`16`	`24`	`$(MAKE) -Chash SUBSYS.o`
`@@ -19,9 +27,6 @@ SUBSYS.o:`
`19`	`27`	`$(MAKE) -C rtree SUBSYS.o`
`20`	`28`	`$(MAKE) -C nbtree SUBSYS.o`
`21`	`29`	`$(MAKE) -C transam SUBSYS.o`
`22`		`-$(LD) -r -o SUBSYS.o\`
`23`		`- common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o\`
`24`		`- index/SUBSYS.o rtree/SUBSYS.o nbtree/SUBSYS.o transam/SUBSYS.o`
`25`	`30`
`26`	`31`	`clean:`
`27`	`32`	`rm -f SUBSYS.o`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,23 @@`
`4`	`4`	`# Makefile for optimizer`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.1 1996/10/27 09:48:14 bryanh Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.2 1996/11/10 03:12:38 bryanh Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`		`-all: SUBSYS.o`
	`11`	`+all:submakeSUBSYS.o`
`12`	`12`
`13`		`-SUBSYS.o:`
	`13`	`+OBJS = path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o`
	`14`	`+`
	`15`	`+SUBSYS.o:$(OBJS)`
	`16`	`+$(LD) -r -o SUBSYS.o$(OBJS)`
	`17`	`+`
	`18`	`+.PHONY: submake clean`
	`19`	`+submake:`
`14`	`20`	`$(MAKE) -C path SUBSYS.o`
`15`	`21`	`$(MAKE) -C plan SUBSYS.o`
`16`	`22`	`$(MAKE) -C prep SUBSYS.o`
`17`	`23`	`$(MAKE) -C util SUBSYS.o`
`18`		`-$(LD) -r -o SUBSYS.o\`
`19`		`- path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o`
`20`	`24`
`21`	`25`	`clean:`
`22`	`26`	`rm -f SUBSYS.o`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`# be converted to Method 2.`
`20`	`20`	`#`
`21`	`21`	`# IDENTIFICATION`
`22`		`-# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.3 1996/10/31 17:27:58 momjian Exp $`
	`22`	`+# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.4 1996/11/10 03:13:27 bryanh Exp $`
`23`	`23`	`#`
`24`	`24`	`#-------------------------------------------------------------------------`
`25`	`25`
`@@ -29,23 +29,25 @@ ifndef PORTNAME`
`29`	`29`	`@false`
`30`	`30`	`else`
`31`	`31`
`32`		`-OBJS =`
	`32`	`+OBJS =$(PORTNAME)/SUBSYS.o`
`33`	`33`
`34`	`34`	`ifeq ($(PORTNAME), sparc_solaris)`
`35`	`35`	`# Other ports get the inet_aton() function from their standard C libraries.`
`36`	`36`	`OBJS += inet_aton.o`
`37`	`37`	`endif`
`38`	`38`
`39`		`-all: SUBSYS.o`
	`39`	`+all:submakeSUBSYS.o`
`40`	`40`
`41`		`-SUBSYS.o:$(PORTNAME)/SUBSYS.o$(OBJS)`
`42`		`-$(LD) -r -o SUBSYS.o$(PORTNAME)/SUBSYS.o$(OBJS)`
	`41`	`+SUBSYS.o:$(OBJS)`
	`42`	`+$(LD) -r -o SUBSYS.o$(OBJS)`
`43`	`43`
`44`		`-$(PORTNAME)/SUBSYS.o:`
	`44`	`+.PHONY: submake clean dep`
	`45`	`+`
	`46`	`+submake:`
`45`	`47`	`$(MAKE) -C$(PORTNAME) SUBSYS.o`
`46`	`48`
`47`	`49`	`clean:`
`48`		`-rm -fSUBSYS.o$(OBJS)`
	`50`	`+rm -f$(OBJS)`
`49`	`51`	`$(MAKE) -C$(PORTNAME) clean`
`50`	`52`
`51`	`53`	`dependdep:`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,23 +4,28 @@`
`4`	`4`	`# Makefile for the storage manager subsystem`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.1 1996/10/27 09:51:49 bryanh Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.2 1996/11/10 03:13:59 bryanh Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`		`-all: SUBSYS.o`
	`11`	`+all:submakeSUBSYS.o`
`12`	`12`
`13`		`-SUBSYS.o:`
	`13`	`+OBJS = buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o\`
	`14`	`+ lmgr/SUBSYS.o page/SUBSYS.o smgr/SUBSYS.o`
	`15`	`+`
	`16`	`+SUBSYS.o:$(OBJS)`
	`17`	`+$(LD) -r -o SUBSYS.o$(OBJS)`
	`18`	`+`
	`19`	`+.PHONY: submake clean dep`
	`20`	`+`
	`21`	`+submake:`
`14`	`22`	`$(MAKE) -C buffer SUBSYS.o`
`15`	`23`	`$(MAKE) -C file SUBSYS.o`
`16`	`24`	`$(MAKE) -C ipc SUBSYS.o`
`17`	`25`	`$(MAKE) -C large_object SUBSYS.o`
`18`	`26`	`$(MAKE) -C lmgr SUBSYS.o`
`19`	`27`	`$(MAKE) -C page SUBSYS.o`
`20`	`28`	`$(MAKE) -C smgr SUBSYS.o`
`21`		`-$(LD) -r -o SUBSYS.o\`
`22`		`- buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o\`
`23`		`- lmgr/SUBSYS.o page/SUBSYS.o smgr/SUBSYS.o`
`24`	`29`
`25`	`30`	`clean:`
`26`	`31`	`rm -f SUBSYS.o`

Comments

(0)