diff options
| author | Peter Eisentraut | 2017-01-23 20:36:27 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-01-23 20:36:27 +0000 |
| commit | 1a2d9a655a5de1c8c9d479c77d6351b878094606 (patch) | |
| tree | 2cb3f2cde95a77f885867e8114dc51d8f2d80a74 | |
| parent | 0bc1207aeb3de951bf95a9e9899b1256216d65f5 (diff) | |
Fix parallel make issue with new fmgrprotos.h
The make rules needed further refinement so that we don't run multiple
generations per build.
reported by Tom Lane
| -rw-r--r-- | src/backend/Makefile | 5 | ||||
| -rw-r--r-- | src/backend/utils/Makefile | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 82975f514a..7a0bbb2942 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -139,7 +139,10 @@ storage/lmgr/lwlocknames.h: storage/lmgr/generate-lwlocknames.pl storage/lmgr/lw utils/errcodes.h: utils/generate-errcodes.pl utils/errcodes.txt $(MAKE) -C utils errcodes.h -utils/fmgroids.h utils/fmgrprotos.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h +# see explanation in parser/Makefile +utils/fmgrprotos.h: utils/fmgroids.h ; + +utils/fmgroids.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h $(MAKE) -C utils $(notdir $@) utils/probes.h: utils/probes.d diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index 4fa5ac26f7..2e35ca58cc 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -21,7 +21,8 @@ all: errcodes.h fmgroids.h fmgrprotos.h probes.h $(SUBDIRS:%=%-recursive): fmgroids.h fmgrprotos.h # see explanation in ../parser/Makefile -fmgroids.h fmgrprotos.h: fmgrtab.c ; +fmgrprotos.h: fmgroids.h ; +fmgroids.h: fmgrtab.c ; fmgrtab.c: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h $(PERL) -I $(catalogdir) $< $(top_srcdir)/src/include/catalog/pg_proc.h |