diff options
| -rw-r--r-- | src/bin/psql/Makefile | 7 | ||||
| -rw-r--r-- | src/bin/psql/mainloop.c | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 06fe45133f0..5edab8388f1 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.52.4.1 2005/03/25 18:18:40 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.52.4.2 2009/11/10 23:12:51 tgl Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ startup.o prompt.o variables.o large_obj.o print.o describe.o \ - psqlscan.o tab-complete.o mbprint.o $(WIN32RES) + tab-complete.o mbprint.o $(WIN32RES) FLEXFLAGS = -Cfe @@ -41,6 +41,9 @@ $(srcdir)/sql_help.h: @echo "*** Perl is needed to build psql help." endif +# psqlscan is compiled as part of mainloop +mainloop.o: psqlscan.c + $(srcdir)/psqlscan.c: psqlscan.l ifdef FLEX $(FLEX) $(FLEXFLAGS) -o'$@' $< diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index 109f23192f8..9a242625c7d 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.66 2005/01/01 05:43:08 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.66.4.1 2009/11/10 23:12:52 tgl Exp $ */ #include "postgres_fe.h" #include "mainloop.h" @@ -346,3 +346,13 @@ MainLoop(FILE *source) return successResult; } /* MainLoop() */ + + +/* + * psqlscan.c is #include'd here instead of being compiled on its own. + * This is because we need postgres_fe.h to be read before any system + * include files, else things tend to break on platforms that have + * multiple infrastructures for stdio.h and so on. flex is absolutely + * uncooperative about that, so we can't compile psqlscan.c on its own. + */ +#include "psqlscan.c" |