Simplify make files, add full dependencies.

10 files changed, 191 insertions, 94 deletions

diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile
new file mode 100644
index 00000000000..5c587fe55bb
--- /dev/null
+++ b/src/backend/optimizer/Makefile
@@ -0,0 +1,32 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for optimizer
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.1 1996/10/27 09:48:14 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+all: SUBSYS.o
+
+SUBSYS.o: 
+	$(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
+	$(MAKE) -C path clean
+	$(MAKE) -C plan clean
+	$(MAKE) -C prep clean
+	$(MAKE) -C util clean
+
+.DEFAULT: 
+	$(MAKE) -C path $@
+	$(MAKE) -C plan $@
+	$(MAKE) -C prep $@
+	$(MAKE) -C util $@
diff --git a/src/backend/optimizer/Makefile.inc b/src/backend/optimizer/Makefile.inc
deleted file mode 100644
index bd453d69645..00000000000
--- a/src/backend/optimizer/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for the optimizer module
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:34 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-optdir=$(CURDIR)/optimizer
-VPATH:=$(VPATH):$(optdir):\
-	$(optdir)/path:$(optdir)/prep:$(optdir)/util:$(optdir)/plan
-
-SUBSRCS=
-include $(optdir)/path/Makefile.inc
-include $(optdir)/prep/Makefile.inc
-include $(optdir)/util/Makefile.inc
-include $(optdir)/plan/Makefile.inc
-SRCS_OPTIMIZER:= $(SUBSRCS)
-
-HEADERS+= clauseinfo.h clauses.h cost.h internal.h joininfo.h keys.h \
-	ordering.h pathnode.h paths.h plancat.h planmain.h \
-	planner.h prep.h tlist.h var.h xfunc.h
-
-
diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile
new file mode 100644
index 00000000000..9814270f088
--- /dev/null
+++ b/src/backend/optimizer/path/Makefile
@@ -0,0 +1,41 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for optimizer/path
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.1 1996/10/27 09:48:20 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = allpaths.o clausesel.o costsize.o hashutils.o indxpath.o \
+       joinpath.o joinrels.o joinutils.o mergeutils.o orindxpath.o \
+       prune.o
+
+# not ready yet: predmig.o xfunc.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/optimizer/path/Makefile.inc b/src/backend/optimizer/path/Makefile.inc
deleted file mode 100644
index 6bb014b0a90..00000000000
--- a/src/backend/optimizer/path/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for optimizer/path
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:35 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS= allpaths.c clausesel.c costsize.c hashutils.c indxpath.c \
-	joinpath.c joinrels.c joinutils.c mergeutils.c orindxpath.c \
-	prune.c
-
-# not ready yet: predmig.c xfunc.c
-
-
-
diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile
new file mode 100644
index 00000000000..ea0a8f95ddb
--- /dev/null
+++ b/src/backend/optimizer/plan/Makefile
@@ -0,0 +1,39 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for optimizer/plan
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.1 1996/10/27 09:48:33 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o
+
+# not ready yet: predmig.o xfunc.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/optimizer/plan/Makefile.inc b/src/backend/optimizer/plan/Makefile.inc
deleted file mode 100644
index eccd412e9ff..00000000000
--- a/src/backend/optimizer/plan/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for optimizer/plan
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:37 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= createplan.c initsplan.c planmain.c planner.c \
-	 setrefs.c
diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile
new file mode 100644
index 00000000000..6cd0da7440a
--- /dev/null
+++ b/src/backend/optimizer/prep/Makefile
@@ -0,0 +1,39 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for optimizer/prep
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.1 1996/10/27 09:48:46 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = archive.o prepqual.o preptlist.o prepunion.o
+
+# not ready yet: predmig.o xfunc.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/optimizer/prep/Makefile.inc b/src/backend/optimizer/prep/Makefile.inc
deleted file mode 100644
index 40026716c9e..00000000000
--- a/src/backend/optimizer/prep/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for optimizer/prep
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:37 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= archive.c prepqual.c preptlist.c prepunion.c
diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile
new file mode 100644
index 00000000000..1713a2215a4
--- /dev/null
+++ b/src/backend/optimizer/util/Makefile
@@ -0,0 +1,40 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for optimizer/util
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.1 1996/10/27 09:48:53 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = clauseinfo.o clauses.o indexnode.o internal.o plancat.o \
+       joininfo.o keys.o ordering.o pathnode.o relnode.o tlist.o var.o
+
+# not ready yet: predmig.o xfunc.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/optimizer/util/Makefile.inc b/src/backend/optimizer/util/Makefile.inc
deleted file mode 100644
index 18955d282c8..00000000000
--- a/src/backend/optimizer/util/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for optimizer/util
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= clauseinfo.c clauses.c indexnode.c internal.c plancat.c \
-	joininfo.c keys.c ordering.c pathnode.c relnode.c tlist.c var.c