Skip to content
Snippets Groups Projects
Commit 348ab948 authored by Thomas G. Lockhart's avatar Thomas G. Lockhart
Browse files

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.
parent 1e70c1fe
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
# #
# #
# IDENTIFICATION # 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 = .. ...@@ -42,7 +42,7 @@ SRCDIR = ..
include ../Makefile.global include ../Makefile.global
DIRS = access bootstrap catalog commands executor lib libpq \ 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 storage tcop utils
ifdef TIOGA ifdef TIOGA
...@@ -115,7 +115,7 @@ postgres.o: $(OBJS) ...@@ -115,7 +115,7 @@ postgres.o: $(OBJS)
# The following targets are specified in make commands that appear in the # The following targets are specified in make commands that appear in the
# make files in our subdirectories. # make files in our subdirectories.
parse.h: parse.h: parser/parse.h
$(MAKE) -C parser parse.h $(MAKE) -C parser parse.h
cp parser/parse.h . cp parser/parse.h .
...@@ -154,7 +154,7 @@ endif ...@@ -154,7 +154,7 @@ endif
# and (2) the parameters of a database system should be set at initdb time, # and (2) the parameters of a database system should be set at initdb time,
# not at postgres build 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.bki.source local1_template1.bki.source \
global1.description local1_template1.description \ global1.description local1_template1.description \
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for nodes # Makefile for nodes
# #
# IDENTIFICATION # 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 ...@@ -22,7 +22,12 @@ all: SUBSYS.o
SUBSYS.o: $(OBJS) SUBSYS.o: $(OBJS)
$(LD) -r -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 $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment