Move keywords.c/kwlookup.c into src/common/.

Now that we have src/common/ for code shared between frontend and backend,
we can get rid of (most of) the klugy ways that the keyword table and
keyword lookup code were formerly shared between different uses.
This is a first step towards a more general plan of getting rid of
special-purpose kluges for sharing code in src/bin/.

I chose to merge kwlookup.c back into keywords.c, as it once was, and
always has been so far as keywords.h is concerned.  We could have
kept them separate, but there is noplace that uses ScanKeywordLookup
without also wanting access to the backend's keyword list, so there
seems little point.

ecpg is still a bit weird, but at least now the trickiness is documented.

I think that the MSVC build script should require no adjustments beyond
what's done here ... but we'll soon find out.

2 files changed, 10 insertions, 15 deletions

diff --git a/src/bin/scripts/.gitignore b/src/bin/scripts/.gitignore
index 1056b2870c0..e12d27a2f1b 100644
--- a/src/bin/scripts/.gitignore
+++ b/src/bin/scripts/.gitignore
@@ -10,8 +10,6 @@
 /pg_isready
 
 /dumputils.c
-/keywords.c
-/kwlookup.c
 /mbprint.c
 /print.c
 
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index c4e04c9aa8a..ad34d42d682 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -25,26 +25,23 @@ all: $(PROGRAMS)
 %: %.o $(WIN32RES)
 	$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
-createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
+createdb: createdb.o common.o dumputils.o | submake-libpq submake-libpgport
 createlang: createlang.o common.o print.o mbprint.o | submake-libpq submake-libpgport
-createuser: createuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
-dropdb: dropdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
+createuser: createuser.o common.o dumputils.o | submake-libpq submake-libpgport
+dropdb: dropdb.o common.o dumputils.o | submake-libpq submake-libpgport
 droplang: droplang.o common.o print.o mbprint.o | submake-libpq submake-libpgport
-dropuser: dropuser.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
-clusterdb: clusterdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
-vacuumdb: vacuumdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
-reindexdb: reindexdb.o common.o dumputils.o kwlookup.o keywords.o | submake-libpq submake-libpgport
+dropuser: dropuser.o common.o dumputils.o | submake-libpq submake-libpgport
+clusterdb: clusterdb.o common.o dumputils.o | submake-libpq submake-libpgport
+vacuumdb: vacuumdb.o common.o dumputils.o | submake-libpq submake-libpgport
+reindexdb: reindexdb.o common.o dumputils.o | submake-libpq submake-libpgport
 pg_isready: pg_isready.o common.o | submake-libpq submake-libpgport
 
-dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%
+dumputils.c: % : $(top_srcdir)/src/bin/pg_dump/%
 	rm -f $@ && $(LN_S) $< .
 
 print.c mbprint.c : % : $(top_srcdir)/src/bin/psql/%
 	rm -f $@ && $(LN_S) $< .
 
-kwlookup.c: % : $(top_srcdir)/src/backend/parser/%
-	rm -f $@ && $(LN_S) $< .
-
 install: all installdirs
 	$(INSTALL_PROGRAM) createdb$(X)   '$(DESTDIR)$(bindir)'/createdb$(X)
 	$(INSTALL_PROGRAM) dropdb$(X)     '$(DESTDIR)$(bindir)'/dropdb$(X)
@@ -65,8 +62,8 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS))
-	rm -f common.o dumputils.o kwlookup.o keywords.o print.o mbprint.o $(WIN32RES)
-	rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c
+	rm -f common.o dumputils.o print.o mbprint.o $(WIN32RES)
+	rm -f dumputils.c print.c mbprint.c
 	rm -rf tmp_check
 
 check: