diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-05-29 05:45:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-05-29 05:45:56 +0000 |
| commit | 091126fa28b4dbfd9df2fc4c22deade58f7e24dc (patch) | |
| tree | 5a4c362f26fa5b00688831ffdf1dfff8b0f60f1f /src/backend/nodes | |
| parent | 18952f67446da73f938d213b5225b99e95657837 (diff) | |
| download | postgresql-091126fa28b4dbfd9df2fc4c22deade58f7e24dc.tar.gz | |
Generated header files parse.h and fmgroids.h are now copied into
the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.
Diffstat (limited to 'src/backend/nodes')
| -rw-r--r-- | src/backend/nodes/Makefile | 13 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 42c86e3d72..ac239bcd6f 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -4,14 +4,12 @@ # Makefile for nodes # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.10 1999/12/13 22:32:47 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.11 2000/05/29 05:44:47 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. -include ../../Makefile.global - -CFLAGS += -I.. +include $(SRCDIR)/Makefile.global OBJS = nodeFuncs.o nodes.o list.o \ copyfuncs.o equalfuncs.o freefuncs.o makefuncs.o outfuncs.o \ @@ -22,12 +20,7 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -outfuncs.o: ../parse.h - -../parse.h: - $(MAKE) -C .. parse.h - -depend dep: ../parse.h +depend dep: $(CC) -MM $(CFLAGS) *.c >depend clean: diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index db8458c37b..7c46177925 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.116 2000/05/25 22:43:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.117 2000/05/29 05:44:47 tgl Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -36,11 +36,11 @@ #include "nodes/plannodes.h" #include "nodes/primnodes.h" #include "nodes/relation.h" +#include "parser/parse.h" #include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/syscache.h" -#include "../parse.h" static void _outDatum(StringInfo str, Datum value, Oid type); static void _outNode(StringInfo str, void *obj); |