From 6f3664cdefdf4477c69eb62f2ae6b98b1affed90 Mon Sep 17 00:00:00 2001 From: wuyuechuan Date: Mon, 4 Dec 2023 16:01:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=20make=E5=9C=A8=E6=9F=90=E4=BA=9B=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E4=B8=8B=E4=BB=8D=E5=8F=AF=E8=83=BD=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=E4=BA=86submake-list=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=BE=9D=E8=B5=96=EF=BC=9A=E5=BD=93=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8kwlist=5Fd.h=E6=97=B6=E6=89=8D=E4=BC=9A=E7=BC=96?= =?UTF-8?q?=E8=AF=91=EF=BC=9B=E5=BD=93kwlist.h=E6=88=96=E8=80=85=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BE=9D=E8=B5=96=E7=BC=96=E8=AF=91=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=97=B6=E6=89=8D=E4=BC=9A=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=BC=96=E8=AF=91kwlist=5Fd.h=202.=20kwlist=5Fd.h=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=B7=AF=E5=BE=84=E4=B8=BA/src/include/parser/?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BA=86make=20clean=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=B8=85=E7=A9=BAkwlist=5Fd.h=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Makefile.global.in | 7 ++++++- src/common/backend/parser/Makefile | 3 +-- src/common/interfaces/ecpg/preproc/Makefile | 5 +---- src/common/interfaces/libpq/frontend_parser/Makefile | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 849cb84b6..64f8385d5 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1125,7 +1125,12 @@ submake-pagecompression: submake-libalarmclient: $(MAKE) -C $(top_builddir)/src/lib/alarm -submake-kwlist: +submake-kwlist: $(top_srcdir)/src/include/parser/kwlist_d.h + +submake-kwlist-clean: + rm $(top_srcdir)/src/include/parser/kwlist_d.h + +$(top_srcdir)/src/include/parser/kwlist_d.h: $(top_srcdir)/src/include/parser/kwlist.h $(GEN_KEYWORDLIST_DEPS) $(GEN_KEYWORDLIST) --extern -o $(top_srcdir)/src/include/parser $(top_srcdir)/src/include/parser/kwlist.h .PHONY: submake-libpq submake-libpgport submake-libplpgsql submake-libalarmclient submake-pagecompression submake-kwlist diff --git a/src/common/backend/parser/Makefile b/src/common/backend/parser/Makefile index f433ee23b..d99865f68 100644 --- a/src/common/backend/parser/Makefile +++ b/src/common/backend/parser/Makefile @@ -95,9 +95,8 @@ hint_gram.o keywords.o parser.o: hint_gram.hpp submake-kwlist # gram.cpp, gram.hpp, and scan.inc are in the distribution tarball, so they # are not cleaned here. -clean distclean maintainer-clean: +clean distclean maintainer-clean: submake-kwlist-clean rm -f lex.backup hint_gram.cpp - rm -f kwlist_d.h maintainer-check: diff --git a/src/common/interfaces/ecpg/preproc/Makefile b/src/common/interfaces/ecpg/preproc/Makefile index a3befecaf..ce68f5bf3 100644 --- a/src/common/interfaces/ecpg/preproc/Makefile +++ b/src/common/interfaces/ecpg/preproc/Makefile @@ -93,7 +93,7 @@ ecpg_kwlist_d.h: ecpg_kwlist.h $(GEN_KEYWORDLIST_DEPS) $(GEN_KEYWORDLIST) --varname ScanECPGKeywords $< # Force these dependencies to be known even without dependency info built: -ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.hpp kwlist_d.h +ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.hpp submake-kwlist ecpg_keywords.o: ecpg_kwlist_d.h c_keywords.o: c_kwlist_d.h keywords.o: $(top_srcdir)/src/include/parser/kwlist.h @@ -101,9 +101,6 @@ keywords.o: $(top_srcdir)/src/include/parser/kwlist.h kwlookup.cpp: % : $(top_srcdir)/src/common/backend/parser/% rm -f $@ && $(LN_S) $< . -kwlist_d.h: $(top_srcdir)/src/include/parser/kwlist.h $(GEN_KEYWORDLIST_DEPS) - $(GEN_KEYWORDLIST) --extern -o $(top_srcdir)/src/include/parser $(top_srcdir)/src/include/parser/kwlist.h - distprep: preproc.y preproc.cpp preproc.hpp pgc.cpp install: all installdirs diff --git a/src/common/interfaces/libpq/frontend_parser/Makefile b/src/common/interfaces/libpq/frontend_parser/Makefile index c78a7e65d..37c3e8cd9 100644 --- a/src/common/interfaces/libpq/frontend_parser/Makefile +++ b/src/common/interfaces/libpq/frontend_parser/Makefile @@ -57,7 +57,7 @@ removefiles: rm -f fe-*.cpp all:softlinks scan.o gram.o ${OBJS} all-static-lib -clean: clean-lib +clean: clean-lib submake-kwlist-clean rm -f gram.cpp gram.hpp scan.cpp rm -f *.o *.a rm -f test