Commit 1a2d9a65 authored by Peter Eisentraut's avatar Peter Eisentraut

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
parent 0bc1207a
...@@ -139,7 +139,10 @@ storage/lmgr/lwlocknames.h: storage/lmgr/generate-lwlocknames.pl storage/lmgr/lw ...@@ -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 utils/errcodes.h: utils/generate-errcodes.pl utils/errcodes.txt
$(MAKE) -C utils errcodes.h $(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 $@) $(MAKE) -C utils $(notdir $@)
utils/probes.h: utils/probes.d utils/probes.h: utils/probes.d
......
...@@ -21,7 +21,8 @@ all: errcodes.h fmgroids.h fmgrprotos.h probes.h ...@@ -21,7 +21,8 @@ all: errcodes.h fmgroids.h fmgrprotos.h probes.h
$(SUBDIRS:%=%-recursive): fmgroids.h fmgrprotos.h $(SUBDIRS:%=%-recursive): fmgroids.h fmgrprotos.h
# see explanation in ../parser/Makefile # 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 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 $(PERL) -I $(catalogdir) $< $(top_srcdir)/src/include/catalog/pg_proc.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment