Simplify make files, add full dependencies.

src/backend/utils/adt/Makefile

@@ -0,0 +1,41 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/adt
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.1 1996/10/27 09:53:15 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = acl.o arrayfuncs.o arrayutils.o bool.o char.o chunk.o date.o \
+	datum.o dt.o filename.o float.o geo-ops.o geo-selfuncs.o int.o \
+	misc.o nabstime.o name.o not_in.o numutils.o oid.o \
+	oidname.o oidint2.o oidint4.o regexp.o regproc.o selfuncs.o \
+	tid.o varchar.o varlena.o sets.o datetimes.o like.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/utils/adt/Makefile.inc

@@ -1,20 +0,0 @@
-
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/adt
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:02 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= acl.c arrayfuncs.c arrayutils.c bool.c char.c chunk.c date.c \
-	datum.c dt.c filename.c float.c geo-ops.c geo-selfuncs.c int.c \
-	misc.c nabstime.c name.c not_in.c numutils.c oid.c \
-	oidname.c oidint2.c oidint4.c regexp.c regproc.c selfuncs.c \
-	tid.c varchar.c varlena.c sets.c datetimes.c like.c
-