diff options
| author | Peter Eisentraut | 2008-08-29 13:02:33 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2008-08-29 13:02:33 +0000 |
| commit | 7c31742a07c7fa311b0c78c598066944db1ca900 (patch) | |
| tree | 2e5bb15af28c1c326eaba4c383ab973530273ee6 /contrib/cube | |
| parent | a2794623d292f7bbfe3134d1407281055acce584 (diff) | |
Remove all traces that suggest that a non-Bison yacc might be supported, and
change build system to use only Bison. Simplify build rules, make file names
uniform. Don't build the token table header file where it is not needed.
Diffstat (limited to 'contrib/cube')
| -rw-r--r-- | contrib/cube/.cvsignore | 1 | ||||
| -rw-r--r-- | contrib/cube/Makefile | 18 |
2 files changed, 6 insertions, 13 deletions
diff --git a/contrib/cube/.cvsignore b/contrib/cube/.cvsignore index fe92b5e14fd..19ecc85b586 100644 --- a/contrib/cube/.cvsignore +++ b/contrib/cube/.cvsignore @@ -1,3 +1,2 @@ cubeparse.c -cubeparse.h cubescan.c diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile index a1610fe91aa..7f91b14c64d 100644 --- a/contrib/cube/Makefile +++ b/contrib/cube/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.21 2007/11/10 23:59:50 momjian Exp $ +# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.22 2008/08/29 13:02:32 petere Exp $ MODULE_big = cube OBJS= cube.o cubeparse.o @@ -26,15 +26,9 @@ endif # cubescan is compiled as part of cubeparse cubeparse.o: $(srcdir)/cubescan.c -# See notes in src/backend/parser/Makefile about the following two rules - -$(srcdir)/cubeparse.c: $(srcdir)/cubeparse.h ; - -$(srcdir)/cubeparse.h: cubeparse.y -ifdef YACC - $(YACC) -d $(YFLAGS) $< - mv -f y.tab.c $(srcdir)/cubeparse.c - mv -f y.tab.h $(srcdir)/cubeparse.h +$(srcdir)/cubeparse.c: cubeparse.y +ifdef BISON + $(BISON) $(BISONFLAGS) -o $@ $< else @$(missing) bison $< $@ endif @@ -46,7 +40,7 @@ else @$(missing) flex $< $@ endif -distprep: $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c +distprep: $(srcdir)/cubeparse.c $(srcdir)/cubescan.c maintainer-clean: - rm -f $(srcdir)/cubeparse.c $(srcdir)/cubeparse.h $(srcdir)/cubescan.c + rm -f $(srcdir)/cubeparse.c $(srcdir)/cubescan.c |