From 091126fa28b4dbfd9df2fc4c22deade58f7e24dc Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 29 May 2000 05:45:56 +0000
Subject: 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.

---
 src/backend/tcop/Makefile   | 18 +++---------------
 src/backend/tcop/postgres.c |  8 +++-----
 2 files changed, 6 insertions(+), 20 deletions(-)

(limited to 'src/backend/tcop')

diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index aaeda91f44..5fafc75f69 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,14 +4,12 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.22 2000/05/28 17:56:04 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.23 2000/05/29 05:45:16 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
-include ../../Makefile.global
-
-CFLAGS+= -I..
+include $(SRCDIR)/Makefile.global
 
 ifeq ($(CC), gcc)
 CFLAGS+= -Wno-error
@@ -24,17 +22,7 @@ all: SUBSYS.o
 SUBSYS.o: $(OBJS)
 	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
-# The following dependencies are picked up by the make dep, but since 
-# not everyone can do make dep, and these are particularly important
-# dependencies (because they don't even exist until you make them),
-# they are hardcoded here.
-
-utility.o: ../parse.h
-
-../parse.h: 
-	$(MAKE) -C .. parse.h
-
-dep depend: ../parse.h
+depend dep:
 	$(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 683f057f21..f4f291bece 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.155 2000/05/21 02:23:30 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.156 2000/05/29 05:45:16 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -48,6 +48,7 @@
 #include "nodes/print.h"
 #include "optimizer/cost.h"
 #include "optimizer/planner.h"
+#include "parser/parse.h"
 #include "parser/parser.h"
 #include "rewrite/rewriteHandler.h"
 #include "tcop/fastpath.h"
@@ -58,9 +59,6 @@
 #include "utils/ps_status.h"
 #include "utils/temprel.h"
 #include "utils/trace.h"
-
-#include "../backend/parser/parse.h"
-
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
 #endif
@@ -1452,7 +1450,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.155 $ $Date: 2000/05/21 02:23:30 $\n");
+		puts("$Revision: 1.156 $ $Date: 2000/05/29 05:45:16 $\n");
 	}
 
 	/*
-- 
cgit v1.2.1