Recognize dependencies more reliably.

4 files changed, 40 insertions, 24 deletions

diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile
index 0bd4e1770f7..a098d3d275e 100644
--- a/src/backend/access/Makefile
+++ b/src/backend/access/Makefile
@@ -4,13 +4,21 @@
 #    Makefile for the access methods module
 #
 # 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
 
-SUBSYS.o: 
+
+all: submake SUBSYS.o
+
+SUBSYS.o: $(OBJS)
+	$(LD) -r -o SUBSYS.o $(OBJS)
+
+.PHONY: submake
+submake:
 	$(MAKE) -C common  SUBSYS.o
 	$(MAKE) -C gist    SUBSYS.o
 	$(MAKE) -C hash    SUBSYS.o
@@ -19,9 +27,6 @@ SUBSYS.o:
 	$(MAKE) -C rtree   SUBSYS.o
 	$(MAKE) -C nbtree  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:
 	rm -f SUBSYS.o
diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile
index 5c587fe55bb..9530d17887c 100644
--- a/src/backend/optimizer/Makefile
+++ b/src/backend/optimizer/Makefile
@@ -4,19 +4,23 @@
 #    Makefile for optimizer
 #
 # 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 plan SUBSYS.o
 	$(MAKE) -C prep 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:
 	rm -f SUBSYS.o
diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 3129a51850b..54c4482c432 100644
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -19,7 +19,7 @@
 # be converted to Method 2.  
 #
 # 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
 	@false
 else
 
-OBJS = 
+OBJS = $(PORTNAME)/SUBSYS.o
 
 ifeq ($(PORTNAME), sparc_solaris)
 # Other ports get the inet_aton() function from their standard C libraries.
 OBJS += inet_aton.o
 endif
 
-all: SUBSYS.o
+all: submake SUBSYS.o
 
-SUBSYS.o: $(PORTNAME)/SUBSYS.o $(OBJS)
-	$(LD) -r -o SUBSYS.o $(PORTNAME)/SUBSYS.o $(OBJS)
+SUBSYS.o: $(OBJS)
+	$(LD) -r -o SUBSYS.o $(OBJS)
 
-$(PORTNAME)/SUBSYS.o:
+.PHONY: submake clean dep
+
+submake:
 	$(MAKE) -C $(PORTNAME) SUBSYS.o
 
 clean:
-	rm -f SUBSYS.o $(OBJS) 
+	rm -f $(OBJS)
 	$(MAKE) -C $(PORTNAME) clean
 
 depend dep:
diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile
index d353badd784..dcab1e36d2d 100644
--- a/src/backend/storage/Makefile
+++ b/src/backend/storage/Makefile
@@ -4,13 +4,21 @@
 #    Makefile for the storage manager subsystem
 #
 # 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 file    SUBSYS.o
 	$(MAKE) -C ipc     SUBSYS.o
@@ -18,9 +26,6 @@ SUBSYS.o:
 	$(MAKE) -C lmgr    SUBSYS.o
 	$(MAKE) -C page    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:
 	rm -f SUBSYS.o