Simplify make files, add full dependencies.

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
+

src/backend/optimizer/util/Makefile.inc

@@ -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