From 348ab948228d9577db08a6c9fcd393438e916389 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Tue, 23 Feb 1999 07:24:08 +0000
Subject: [PATCH] Rearrange order of subdirectory creation to help generate
parse.h file early enough to use in nodes/. Try to be more complete for
rules on generating parse.h, but it still does not work any better than
before. Should be able to make correctly if parser/gram.y is updated even
without a "make clean" but so far not there yet.
---
src/backend/Makefile | 8 ++++----
src/backend/nodes/Makefile | 9 +++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 0ec08e55365..4b84b789a06 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.36 1999/01/21 16:08:36 vadim Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.37 1999/02/23 07:24:02 thomas Exp $
#
#-------------------------------------------------------------------------
@@ -42,7 +42,7 @@ SRCDIR = ..
include ../Makefile.global
DIRS = access bootstrap catalog commands executor lib libpq \
- main nodes optimizer parser port postmaster regex rewrite \
+ main parser nodes optimizer port postmaster regex rewrite \
storage tcop utils
ifdef TIOGA
@@ -115,7 +115,7 @@ postgres.o: $(OBJS)
# The following targets are specified in make commands that appear in the
# make files in our subdirectories.
-parse.h:
+parse.h: parser/parse.h
$(MAKE) -C parser parse.h
cp parser/parse.h .
@@ -154,7 +154,7 @@ endif
# and (2) the parameters of a database system should be set at initdb time,
# not at postgres build time.
-install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
+install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h \
global1.bki.source local1_template1.bki.source \
global1.description local1_template1.description \
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile
index 0e50980c289..91bdef03d26 100644
--- a/src/backend/nodes/Makefile
+++ b/src/backend/nodes/Makefile
@@ -4,7 +4,7 @@
# Makefile for nodes
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.7 1999/02/06 16:50:24 wieck Exp $
+# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.8 1999/02/23 07:24:08 thomas Exp $
#
#-------------------------------------------------------------------------
@@ -22,7 +22,12 @@ all: SUBSYS.o
SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
-depend dep:
+outfuncs.o: ../parse.h
+
+../parse.h:
+ $(MAKE) -C .. parse.h
+
+depend dep: ../parse.h
$(CC) -MM $(CFLAGS) *.c >depend
clean:
--
GitLab