Skip to content

Commit 348ab94

Browse files
author
Thomas G. Lockhart
committed
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.
1 parent 1e70c1f commit 348ab94

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/backend/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.36 1999/01/21 16:08:36 vadim Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.37 1999/02/23 07:24:02 thomas Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

4141
SRCDIR = ..
4242
include ../Makefile.global
4343

4444
DIRS = access bootstrap catalog commands executor lib libpq \
45-
main nodes optimizer parser port postmaster regex rewrite \
45+
main parser nodes optimizer port postmaster regex rewrite \
4646
storage tcop utils
4747

4848
ifdef TIOGA
@@ -115,7 +115,7 @@ postgres.o: $(OBJS)
115115
# The following targets are specified in make commands that appear in the
116116
# make files in our subdirectories.
117117

118-
parse.h:
118+
parse.h: parser/parse.h
119119
$(MAKE) -C parser parse.h
120120
cp parser/parse.h .
121121

@@ -154,7 +154,7 @@ endif
154154
# and (2) the parameters of a database system should be set at initdb time,
155155
# not at postgres build time.
156156

157-
install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
157+
install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h \
158158
global1.bki.source local1_template1.bki.source \
159159
global1.description local1_template1.description \
160160
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample

src/backend/nodes/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for nodes
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.7 1999/02/06 16:50:24 wieck Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.8 1999/02/23 07:24:08 thomas Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -22,7 +22,12 @@ all: SUBSYS.o
2222
SUBSYS.o: $(OBJS)
2323
$(LD) -r -o SUBSYS.o $(OBJS)
2424

25-
depend dep:
25+
outfuncs.o: ../parse.h
26+
27+
../parse.h:
28+
$(MAKE) -C .. parse.h
29+
30+
depend dep: ../parse.h
2631
$(CC) -MM $(CFLAGS) *.c >depend
2732

2833
clean:

0 commit comments

Comments
 (0)