database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

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

Browse Source 
Reported-by: Jeff Janes, Tom Lane
Discussion: https://postgr.es/m/CAMkU%3D1w1qBvoW82ZTFpAKae027R-2OHw-m6ALe0VQRNAFueBVA%40mail.gmail.com
This commit is contained in:
Alexander Korotkov 2019-03-17 10:51:28 +03:00
parent b8f9a2a69a
commit 142c400d72
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/Makefile
View File

@ -315,8 +315,10 @@ maintainer-clean: distclean
replication/syncrep_scanner.c \ replication/syncrep_scanner.c \
storage/lmgr/lwlocknames.c \ storage/lmgr/lwlocknames.c \
storage/lmgr/lwlocknames.h \ storage/lmgr/lwlocknames.h \
utils/misc/guc-file.c \ utils/adt/jsonpath_gram.c \
utils/adt/jsonpath_gram.h \ utils/adt/jsonpath_gram.h \
utils/adt/jsonpath_scan.c \
utils/misc/guc-file.c \
utils/sort/qsort_tuple.c utils/sort/qsort_tuple.c

10
src/backend/utils/adt/Makefile
View File

@ -33,11 +33,19 @@ OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \
txid.o uuid.o varbit.o varchar.o varlena.o version.o \ txid.o uuid.o varbit.o varchar.o varlena.o version.o \
windowfuncs.o xid.o xml.o windowfuncs.o xid.o xml.o
# There is no correct way to write a rule that generates two files.
# See comment in src/backend/parser/Makefile for the explanation of
# the trick used here.
jsonpath_gram.h: jsonpath_gram.c
touch $@
jsonpath_gram.c: BISONFLAGS += -d jsonpath_gram.c: BISONFLAGS += -d
jsonpath_scan.c: FLEXFLAGS = -CF -p -p jsonpath_scan.c: FLEXFLAGS = -CF -p -p
jsonpath_scan.c: FLEX_NO_BACKUP=yes
jsonpath_scan.c: FLEX_FIX_WARNING=yes
jsonpath_gram.h: jsonpath_gram.c ;
# Force these dependencies to be known even without dependency info built: # Force these dependencies to be known even without dependency info built:
jsonpath_gram.o jsonpath_scan.o jsonpath_parser.o: jsonpath_gram.h jsonpath_gram.o jsonpath_scan.o jsonpath_parser.o: jsonpath_gram.h

4
src/include/Makefile
View File

@ -54,7 +54,7 @@ install: all installdirs
cp $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir/ || exit; \ cp $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir/ || exit; \
done done
ifeq ($(vpath_build),yes) ifeq ($(vpath_build),yes)
for file in catalog/schemapg.h catalog/pg_*_d.h parser/gram.h storage/lwlocknames.h utils/probes.h; do \ for file in catalog/schemapg.h catalog/pg_*_d.h parser/gram.h storage/lwlocknames.h utils/probes.h utils/jsonpath_gram.h; do \
cp $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \ cp $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \
done done
endif endif
@ -78,7 +78,7 @@ uninstall:
clean: clean:
rm -f utils/fmgroids.h utils/fmgrprotos.h utils/errcodes.h utils/header-stamp rm -f utils/fmgroids.h utils/fmgrprotos.h utils/errcodes.h utils/header-stamp
rm -f parser/gram.h storage/lwlocknames.h utils/probes.h rm -f parser/gram.h storage/lwlocknames.h utils/probes.h utils/jsonpath_gram.h
rm -f catalog/schemapg.h catalog/pg_*_d.h catalog/header-stamp rm -f catalog/schemapg.h catalog/pg_*_d.h catalog/header-stamp
distclean maintainer-clean: clean distclean maintainer-clean: clean