Simplify make files, add full dependencies.

src/backend/executor/Makefile

@@ -0,0 +1,42 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for executor
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.1 1996/10/27 09:47:26 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../..
+include ../../Makefile.global
+
+INCLUDE_OPT = -I.. \
+              -I../port/$(PORTNAME) \
+              -I../include \
+              -I../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
+       execProcnode.o execQual.o execScan.o execTuples.o \
+       execUtils.o functions.o nodeAppend.o nodeAgg.o nodeHash.o \
+       nodeHashjoin.o nodeIndexscan.o nodeMaterial.o nodeMergejoin.o \
+       nodeNestloop.o nodeResult.o nodeSeqscan.o nodeSort.o \
+       nodeUnique.o nodeTee.o nodeGroup.o
+
+all: SUBSYS.o
+
+SUBSYS.o: $(OBJS)
+	$(LD) -r -o SUBSYS.o $(OBJS)
+
+depend dep:
+	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+
+clean: 
+	rm -f SUBSYS.o $(OBJS) 
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+

src/backend/executor/Makefile.inc

@@ -1,29 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for the executor module
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/executor/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:24 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-VPATH:= $(VPATH):$(CURDIR)/executor
-
-SRCS_EXECUTOR= execAmi.c execFlatten.c execJunk.c execMain.c \
-	execProcnode.c execQual.c execScan.c execTuples.c \
-	execUtils.c functions.c nodeAppend.c nodeAgg.c nodeHash.c \
-	nodeHashjoin.c nodeIndexscan.c nodeMaterial.c nodeMergejoin.c \
-	nodeNestloop.c nodeResult.c nodeSeqscan.c nodeSort.c \
-	nodeUnique.c nodeTee.c nodeGroup.c
-
-HEADERS+= execFlatten.h execdebug.h execdefs.h execdesc.h \
-	executor.h functions.h hashjoin.h nodeAgg.h nodeAppend.h \
-	nodeHash.h nodeHashjoin.h nodeIndexscan.h nodeMaterial.h \
-	nodeMergejoin.h nodeNestloop.h nodeResult.h  \
-	nodeSeqscan.h nodeSort.h nodeUnique.h tuptable.h nodeTee.h \
-	nodeGroup.h
-