Commit142c400

committed

Fix make rules for jsonpath grammar making them similar to SQL grammar

1 parentb8f9a2a commit142c400Copy full SHA for 142c400

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,10 @@ maintainer-clean: distclean`
`315`	`315`	`replication/syncrep_scanner.c\`
`316`	`316`	`storage/lmgr/lwlocknames.c\`
`317`	`317`	`storage/lmgr/lwlocknames.h\`
`318`		`- utils/misc/guc-file.c\`
	`318`	`+ utils/adt/jsonpath_gram.c\`
`319`	`319`	`utils/adt/jsonpath_gram.h\`
	`320`	`+ utils/adt/jsonpath_scan.c\`
	`321`	`+ utils/misc/guc-file.c\`
`320`	`322`	`utils/sort/qsort_tuple.c`
`321`	`323`
`322`	`324`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,19 @@ OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \`
`33`	`33`	`txid.o uuid.o varbit.o varchar.o varlena.o version.o\`
`34`	`34`	`windowfuncs.o xid.o xml.o`
`35`	`35`
	`36`	`+# There is no correct way to write a rule that generates two files.`
	`37`	`+# See comment in src/backend/parser/Makefile for the explanation of`
	`38`	`+# the trick used here.`
	`39`	`+`
	`40`	`+jsonpath_gram.h: jsonpath_gram.c`
	`41`	`+touch$@`
	`42`	`+`
`36`	`43`	`jsonpath_gram.c: BISONFLAGS += -d`
`37`	`44`
`38`	`45`	`jsonpath_scan.c: FLEXFLAGS = -CF -p -p`
	`46`	`+jsonpath_scan.c: FLEX_NO_BACKUP=yes`
	`47`	`+jsonpath_scan.c: FLEX_FIX_WARNING=yes`
`39`	`48`
`40`		`-jsonpath_gram.h: jsonpath_gram.c ;`
`41`	`49`
`42`	`50`	`# Force these dependencies to be known even without dependency info built:`
`43`	`51`	`jsonpath_gram.ojsonpath_scan.ojsonpath_parser.o: jsonpath_gram.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ install: all installdirs`
`54`	`54`	`cp $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir/ \|\| exit; \`
`55`	`55`	`done`
`56`	`56`	`ifeq ($(vpath_build),yes)`
`57`		`-for file in catalog/schemapg.h catalog/pg_*_d.h parser/gram.h storage/lwlocknames.h utils/probes.h; do \`
	`57`	`+for file in catalog/schemapg.h catalog/pg_*_d.h parser/gram.h storage/lwlocknames.h utils/probes.h utils/jsonpath_gram.h; do \`
`58`	`58`	`cp $$file '$(DESTDIR)$(includedir_server)'/$$file \|\| exit; \`
`59`	`59`	`done`
`60`	`60`	`endif`
`@@ -78,7 +78,7 @@ uninstall:`
`78`	`78`
`79`	`79`	`clean:`
`80`	`80`	`rm -f utils/fmgroids.h utils/fmgrprotos.h utils/errcodes.h utils/header-stamp`
`81`		`-rm -f parser/gram.h storage/lwlocknames.h utils/probes.h`
	`81`	`+rm -f parser/gram.h storage/lwlocknames.h utils/probes.h utils/jsonpath_gram.h`
`82`	`82`	`rm -f catalog/schemapg.h catalog/pg_*_d.h catalog/header-stamp`
`83`	`83`
`84`	`84`	`distcleanmaintainer-clean: clean`

Comments

(0)