From 76294e1d3859830f7e6cd0582f97ee6c6299a5b0 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Thu, 31 Oct 1996 10:59:42 +0000 Subject: [PATCH] Cleanup Makefiles Add #include "postgres.h" and #include --- src/backend/optimizer/path/Makefile | 6 ++---- src/backend/optimizer/path/joinpath.c | 5 ++++- src/backend/optimizer/plan/Makefile | 6 ++---- src/backend/optimizer/plan/createplan.c | 7 ++++--- src/backend/optimizer/plan/initsplan.c | 4 +++- src/backend/optimizer/plan/planmain.c | 4 +++- src/backend/optimizer/plan/planner.c | 4 +++- src/backend/optimizer/plan/setrefs.c | 4 +++- src/backend/optimizer/prep/Makefile | 6 ++---- src/backend/optimizer/prep/prepqual.c | 4 +++- src/backend/optimizer/prep/prepunion.c | 4 +++- src/backend/optimizer/util/Makefile | 6 ++---- src/backend/optimizer/util/indexnode.c | 4 +++- src/backend/optimizer/util/internal.c | 5 +++-- src/backend/optimizer/util/ordering.c | 5 ++++- src/backend/optimizer/util/var.c | 6 +++++- 16 files changed, 49 insertions(+), 31 deletions(-) diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 9814270f088..5617b2cc649 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.1 1996/10/27 09:48:20 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.2 1996/10/31 10:58:58 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../include \ +INCLUDE_OPT = -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index e727388715c..87365278ffa 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -7,12 +7,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.1.1.1 1996/07/09 06:21:35 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.2 1996/10/31 10:59:00 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include #include +#include "postgres.h" + #include "storage/buf_internals.h" #include "nodes/pg_list.h" diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index ea0a8f95ddb..6b3eb220ba3 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.1 1996/10/27 09:48:33 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.2 1996/10/31 10:59:05 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../include \ +INCLUDE_OPT = -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index dc182e9e609..68c1cd14c3c 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.3 1996/09/10 06:48:32 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.4 1996/10/31 10:59:09 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "c.h" +#include + +#include "postgres.h" #include "nodes/execnodes.h" #include "nodes/plannodes.h" @@ -21,7 +23,6 @@ #include "nodes/makefuncs.h" -#include "utils/elog.h" #include "utils/lsyscache.h" #include "utils/palloc.h" #include "utils/builtins.h" diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index fc80402a050..fcafc872718 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.1.1.1 1996/07/09 06:21:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.2 1996/10/31 10:59:13 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/pg_list.h" diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 5740b83a2d3..1da01e10911 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.1.1.1 1996/07/09 06:21:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.2 1996/10/31 10:59:14 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/pg_list.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 4e57af8aa27..78a18aed8de 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.1.1.1 1996/07/09 06:21:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.2 1996/10/31 10:59:15 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/pg_list.h" diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index e698c930e1d..21a7012999e 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.1.1.1 1996/07/09 06:21:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.2 1996/10/31 10:59:17 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/pg_list.h" diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 6cd0da7440a..b15e06aee63 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.1 1996/10/27 09:48:46 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.2 1996/10/31 10:59:23 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../include \ +INCLUDE_OPT = -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index e1aafa7db1e..aa6a088c492 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.2 1996/10/31 10:59:27 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/pg_list.h" diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 8e1491940db..1dd33103107 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.2 1996/10/31 10:59:30 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/nodes.h" diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index 1713a2215a4..51d1a9ebaaf 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.1 1996/10/27 09:48:53 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.2 1996/10/31 10:59:34 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../include \ +INCLUDE_OPT = -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c index 7fd74889202..8e9237e6845 100644 --- a/src/backend/optimizer/util/indexnode.c +++ b/src/backend/optimizer/util/indexnode.c @@ -7,10 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.2 1996/10/31 10:59:37 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "nodes/plannodes.h" diff --git a/src/backend/optimizer/util/internal.c b/src/backend/optimizer/util/internal.c index 1db22f2b949..a10dbf8fea4 100644 --- a/src/backend/optimizer/util/internal.c +++ b/src/backend/optimizer/util/internal.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.2 1996/10/31 10:59:39 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -20,14 +20,15 @@ * Shared with the executor. * */ +#include +#include "postgres.h" #include "optimizer/internal.h" #include "nodes/relation.h" #include "nodes/plannodes.h" #include "nodes/primnodes.h" -#include "utils/elog.h" #include "utils/palloc.h" #if 0 diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c index 3dffbff9f3c..386753bd872 100644 --- a/src/backend/optimizer/util/ordering.c +++ b/src/backend/optimizer/util/ordering.c @@ -7,10 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.2 1996/10/31 10:59:41 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + +#include "postgres.h" #include "optimizer/internal.h" #include "optimizer/ordering.h" diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index b4f8436c775..d40ff179598 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -7,10 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.1.1.1 1996/07/09 06:21:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.2 1996/10/31 10:59:42 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include + +#include "postgres.h" + #include "nodes/primnodes.h" #include "nodes/nodeFuncs.h"