aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
authorBryan Henderson <bryanh@giraffe.netgate.net>1996-10-27 09:55:05 +0000
committerBryan Henderson <bryanh@giraffe.netgate.net>1996-10-27 09:55:05 +0000
commitb0d6f0aa639610f47bed818f7bc4e584cd9a391b (patch)
tree103835aa6881d565d6ab23d09b7784c4952d8a2b /src/backend/executor
parent1e39d14ff33f7ac436bbbd0b46a3e31faafed561 (diff)
downloadpostgresql-b0d6f0aa639610f47bed818f7bc4e584cd9a391b.tar.gz
postgresql-b0d6f0aa639610f47bed818f7bc4e584cd9a391b.zip
Simplify make files, add full dependencies.
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/Makefile42
-rw-r--r--src/backend/executor/Makefile.inc29
2 files changed, 42 insertions, 29 deletions
diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
new file mode 100644
index 00000000000..cc1f5d1c2e1
--- /dev/null
+++ b/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
+
diff --git a/src/backend/executor/Makefile.inc b/src/backend/executor/Makefile.inc
deleted file mode 100644
index 211e725cec4..00000000000
--- a/src/backend/executor/Makefile.inc
+++ /dev/null
@@ -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
-