Commit 08029fac authored by Bryan Henderson's avatar Bryan Henderson

Recognize dependencies more reliably.

parent aaeef4d1
...@@ -4,13 +4,21 @@ ...@@ -4,13 +4,21 @@
# Makefile for the access methods module # Makefile for the access methods module
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.1 1996/10/27 09:45:42 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.2 1996/11/10 03:11:46 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
all: SUBSYS.o OBJS = common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o \
index/SUBSYS.o rtree/SUBSYS.o nbtree/SUBSYS.o transam/SUBSYS.o
all: submake SUBSYS.o
SUBSYS.o: SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
.PHONY: submake
submake:
$(MAKE) -C common SUBSYS.o $(MAKE) -C common SUBSYS.o
$(MAKE) -C gist SUBSYS.o $(MAKE) -C gist SUBSYS.o
$(MAKE) -C hash SUBSYS.o $(MAKE) -C hash SUBSYS.o
...@@ -19,9 +27,6 @@ SUBSYS.o: ...@@ -19,9 +27,6 @@ SUBSYS.o:
$(MAKE) -C rtree SUBSYS.o $(MAKE) -C rtree SUBSYS.o
$(MAKE) -C nbtree SUBSYS.o $(MAKE) -C nbtree SUBSYS.o
$(MAKE) -C transam SUBSYS.o $(MAKE) -C transam SUBSYS.o
$(LD) -r -o SUBSYS.o \
common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o \
index/SUBSYS.o rtree/SUBSYS.o nbtree/SUBSYS.o transam/SUBSYS.o
clean: clean:
rm -f SUBSYS.o rm -f SUBSYS.o
......
...@@ -4,19 +4,23 @@ ...@@ -4,19 +4,23 @@
# Makefile for optimizer # Makefile for optimizer
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.1 1996/10/27 09:48:14 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.2 1996/11/10 03:12:38 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
all: SUBSYS.o all: submake SUBSYS.o
SUBSYS.o: OBJS = path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o
SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
.PHONY: submake clean
submake:
$(MAKE) -C path SUBSYS.o $(MAKE) -C path SUBSYS.o
$(MAKE) -C plan SUBSYS.o $(MAKE) -C plan SUBSYS.o
$(MAKE) -C prep SUBSYS.o $(MAKE) -C prep SUBSYS.o
$(MAKE) -C util SUBSYS.o $(MAKE) -C util SUBSYS.o
$(LD) -r -o SUBSYS.o \
path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o
clean: clean:
rm -f SUBSYS.o rm -f SUBSYS.o
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
# be converted to Method 2. # be converted to Method 2.
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.3 1996/10/31 17:27:58 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.4 1996/11/10 03:13:27 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -29,23 +29,25 @@ ifndef PORTNAME ...@@ -29,23 +29,25 @@ ifndef PORTNAME
@false @false
else else
OBJS = OBJS = $(PORTNAME)/SUBSYS.o
ifeq ($(PORTNAME), sparc_solaris) ifeq ($(PORTNAME), sparc_solaris)
# Other ports get the inet_aton() function from their standard C libraries. # Other ports get the inet_aton() function from their standard C libraries.
OBJS += inet_aton.o OBJS += inet_aton.o
endif endif
all: SUBSYS.o all: submake SUBSYS.o
SUBSYS.o: $(PORTNAME)/SUBSYS.o $(OBJS) SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(PORTNAME)/SUBSYS.o $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS)
$(PORTNAME)/SUBSYS.o: .PHONY: submake clean dep
submake:
$(MAKE) -C $(PORTNAME) SUBSYS.o $(MAKE) -C $(PORTNAME) SUBSYS.o
clean: clean:
rm -f SUBSYS.o $(OBJS) rm -f $(OBJS)
$(MAKE) -C $(PORTNAME) clean $(MAKE) -C $(PORTNAME) clean
depend dep: depend dep:
......
...@@ -4,13 +4,21 @@ ...@@ -4,13 +4,21 @@
# Makefile for the storage manager subsystem # Makefile for the storage manager subsystem
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.1 1996/10/27 09:51:49 bryanh Exp $ # $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.2 1996/11/10 03:13:59 bryanh Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
all: SUBSYS.o all: submake SUBSYS.o
SUBSYS.o: OBJS = buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o \
lmgr/SUBSYS.o page/SUBSYS.o smgr/SUBSYS.o
SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
.PHONY: submake clean dep
submake:
$(MAKE) -C buffer SUBSYS.o $(MAKE) -C buffer SUBSYS.o
$(MAKE) -C file SUBSYS.o $(MAKE) -C file SUBSYS.o
$(MAKE) -C ipc SUBSYS.o $(MAKE) -C ipc SUBSYS.o
...@@ -18,9 +26,6 @@ SUBSYS.o: ...@@ -18,9 +26,6 @@ SUBSYS.o:
$(MAKE) -C lmgr SUBSYS.o $(MAKE) -C lmgr SUBSYS.o
$(MAKE) -C page SUBSYS.o $(MAKE) -C page SUBSYS.o
$(MAKE) -C smgr SUBSYS.o $(MAKE) -C smgr SUBSYS.o
$(LD) -r -o SUBSYS.o \
buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o \
lmgr/SUBSYS.o page/SUBSYS.o smgr/SUBSYS.o
clean: clean:
rm -f SUBSYS.o rm -f SUBSYS.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment