Commit1a2d9a6

committed

Fix parallel make issue with new fmgrprotos.h

The make rules needed further refinement so that we don't run multiplegenerations per build.reported by Tom Lane

1 parent0bc1207 commit1a2d9a6Copy full SHA for 1a2d9a6

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,10 @@ storage/lmgr/lwlocknames.h: storage/lmgr/generate-lwlocknames.pl storage/lmgr/lw`
`139`	`139`	`utils/errcodes.h: utils/generate-errcodes.pl utils/errcodes.txt`
`140`	`140`	`$(MAKE) -C utils errcodes.h`
`141`	`141`
`142`		`-utils/fmgroids.hutils/fmgrprotos.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm$(top_srcdir)/src/include/catalog/pg_proc.h`
	`142`	`+# see explanation in parser/Makefile`
	`143`	`+utils/fmgrprotos.h: utils/fmgroids.h ;`
	`144`	`+`
	`145`	`+utils/fmgroids.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm$(top_srcdir)/src/include/catalog/pg_proc.h`
`143`	`146`	`$(MAKE) -C utils$(notdir$@)`
`144`	`147`
`145`	`148`	`utils/probes.h: utils/probes.d`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ all: errcodes.h fmgroids.h fmgrprotos.h probes.h`
`21`	`21`	`$(SUBDIRS:%=%-recursive): fmgroids.h fmgrprotos.h`
`22`	`22`
`23`	`23`	`# see explanation in ../parser/Makefile`
`24`		`-fmgroids.hfmgrprotos.h: fmgrtab.c ;`
	`24`	`+fmgrprotos.h: fmgroids.h ;`
	`25`	`+fmgroids.h: fmgrtab.c ;`
`25`	`26`
`26`	`27`	`fmgrtab.c: Gen_fmgrtab.pl$(catalogdir)/Catalog.pm$(top_srcdir)/src/include/catalog/pg_proc.h`
`27`	`28`	`$(PERL) -I$(catalogdir)$<$(top_srcdir)/src/include/catalog/pg_proc.h`

Comments

(0)