diff options
Diffstat (limited to 'src/backend/bootstrap')
| -rw-r--r-- | src/backend/bootstrap/.cvsignore | 1 | ||||
| -rw-r--r-- | src/backend/bootstrap/Makefile | 24 | ||||
| -rw-r--r-- | src/backend/bootstrap/bootscanner.l | 4 |
3 files changed, 8 insertions, 21 deletions
diff --git a/src/backend/bootstrap/.cvsignore b/src/backend/bootstrap/.cvsignore index 511777ca30c..5201be98868 100644 --- a/src/backend/bootstrap/.cvsignore +++ b/src/backend/bootstrap/.cvsignore @@ -1,3 +1,2 @@ bootparse.c -bootstrap_tokens.h bootscanner.c diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index ac83245395d..3a68367aaee 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -2,7 +2,7 @@ # # Makefile for the bootstrap module # -# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.36 2008/02/19 10:30:07 petere Exp $ +# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.37 2008/08/29 13:02:32 petere Exp $ # #------------------------------------------------------------------------- @@ -20,15 +20,9 @@ include $(top_srcdir)/src/backend/common.mk # bootscanner is compiled as part of bootparse bootparse.o: $(srcdir)/bootscanner.c -# See notes in src/backend/parser/Makefile about the following two rules - -$(srcdir)/bootparse.c: $(srcdir)/bootstrap_tokens.h ; - -$(srcdir)/bootstrap_tokens.h: bootparse.y -ifdef YACC - $(YACC) -d $(YFLAGS) $< - mv -f y.tab.c $(srcdir)/bootparse.c - mv -f y.tab.h $(srcdir)/bootstrap_tokens.h +$(srcdir)/bootparse.c: bootparse.y +ifdef BISON + $(BISON) $(BISONFLAGS) -o $@ $< else @$(missing) bison $< $@ endif @@ -40,12 +34,6 @@ else @$(missing) flex $< $@ endif -# Force these dependencies to be known even without dependency info built: -bootstrap.o bootparse.o: $(srcdir)/bootstrap_tokens.h - -# bootparse.c, bootstrap_tokens.h, and bootscanner.c are in the distribution -# tarball, so they are not cleaned here. -clean: -# And the garbage that might have been left behind by partial build: - @rm -f y.tab.h y.tab.c y.output lex.yy.c +# bootparse.c and bootscanner.c are in the distribution tarball, so +# they are not cleaned here. diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l index ebcd9e99d57..49bef984203 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.46 2008/05/09 15:36:31 petere Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.47 2008/08/29 13:02:32 petere Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ #include "utils/rel.h" /* Not needed now that this file is compiled as part of bootparse. */ -/* #include "bootstrap_tokens.h" */ +/* #include "bootparse.h" */ /* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */ |