diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-08-28 11:53:23 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-08-28 11:53:23 +0000 |
| commit | f03fc94e7df1078959a4fa4a4b5c4e02b09a2bc1 (patch) | |
| tree | 1aadad9c51a781f608d1820000a4478dbf00aa83 /src/backend | |
| parent | 4c8d2f7f7b129d8fd679bb970345593ac6190725 (diff) | |
| download | postgresql-f03fc94e7df1078959a4fa4a4b5c4e02b09a2bc1.tar.gz postgresql-f03fc94e7df1078959a4fa4a4b5c4e02b09a2bc1.zip | |
New configure test for flex, which recognizes only flex but does so in all
incarnations (I hope). When an acceptable flex version is not found, print
instructive error messages from both configure and the makefiles, so that
users can continue building anyway.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/bootstrap/Makefile | 10 | ||||
| -rw-r--r-- | src/backend/parser/Makefile | 9 | ||||
| -rw-r--r-- | src/backend/utils/misc/Makefile | 17 |
3 files changed, 22 insertions, 14 deletions
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index d1b40e99830..cf3b29477e0 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -2,7 +2,7 @@ # # Makefile for the bootstrap module # -# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.24 2000/07/19 16:29:47 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.25 2000/08/28 11:53:17 petere Exp $ # #------------------------------------------------------------------------- @@ -48,9 +48,13 @@ $(srcdir)/bootparse.c $(srcdir)/bootstrap_tokens.h: bootparse.y Makefile rm -f y.tab.c y.tab.h $(srcdir)/bootscanner.c: bootscanner.l Makefile - $(LEX) $(LFLAGS) $< - $(sed-magic) < lex.yy.c > $@ +ifdef FLEX + $(FLEX) $(FLEXFLAGS) $< + $(sed-magic) lex.yy.c > $@ rm -f lex.yy.c +else + @$(missing) flex $< $@ +endif clean: rm -f SUBSYS.o $(OBJS) bootstrap.o diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 169575e082d..6ef084d04b6 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -2,7 +2,7 @@ # # Makefile for parser # -# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.28 2000/07/19 16:29:50 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.29 2000/08/28 11:53:19 petere Exp $ # #------------------------------------------------------------------------- @@ -30,8 +30,11 @@ $(srcdir)/gram.c $(srcdir)/parse.h: gram.y mv y.tab.h $(srcdir)/parse.h $(srcdir)/scan.c: scan.l - $(LEX) $(LFLAGS) $< - mv lex.yy.c $@ +ifdef FLEX + $(FLEX) $(FLEXFLAGS) -o'$@' $< +else + @$(missing) flex $< $@ +endif analyze.o keywords.o parse_clause.o parse_expr.o scan.o: $(srcdir)/parse.h diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index d5f5843a738..140ce9df17c 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.17 2000/08/25 10:00:31 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.18 2000/08/28 11:53:20 petere Exp $ subdir = src/backend/utils/misc top_builddir = ../../../.. @@ -19,18 +19,19 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) guc-file.c: guc-file.l - $(LEX) $(LFLAGS) $< - sed -e 's/lex\.yy\.c/guc-file\.c/g' \ - -e 's/^yy/GUC_yy/g' \ - -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' < lex.yy.c > $@ +ifdef FLEX + $(FLEX) $(FLEXFLAGS) $< + sed -e 's/^yy/GUC_yy/g' -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' lex.yy.c > $@ rm -f lex.yy.c - +else + @$(missing) flex $< $@ +endif # Note: guc-file.c is not deleted by 'make clean', # since we want to ship it in distribution tarballs. - clean: - rm -f SUBSYS.o $(OBJS) lex.yy.c + rm -f SUBSYS.o $(OBJS) + @rm -f lex.yy.c depend dep: $(CC) -MM $(CFLAGS) *.c >depend |