20 files changed, 416 insertions, 197 deletions
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
new file mode 100644
index 0000000000..7e0668c994
--- /dev/null
+++ b/src/backend/utils/Makefile
@@ -0,0 +1,68 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.1 1996/10/27 09:53:07 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+INCLUDE_OPT = -I.. \
+              -I../include \
+              -I../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+all: SUBSYS.o
+
+SUBSYS.o: fmgrtab.o
+	$(MAKE) -C adt SUBSYS.o
+	$(MAKE) -C cache SUBSYS.o
+	$(MAKE) -C error SUBSYS.o
+	$(MAKE) -C fmgr SUBSYS.o
+	$(MAKE) -C hash SUBSYS.o
+	$(MAKE) -C init SUBSYS.o
+	$(MAKE) -C mmgr SUBSYS.o
+	$(MAKE) -C sort SUBSYS.o
+	$(MAKE) -C time SUBSYS.o
+	$(LD) -r -o SUBSYS.o \
+	    fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \
+	    fmgr/SUBSYS.o hash/SUBSYS.o init/SUBSYS.o mmgr/SUBSYS.o \
+	    sort/SUBSYS.o time/SUBSYS.o
+
+fmgrtab.o: ../fmgr.h
+
+../fmgr.h: 
+	$(MAKE) -C .. fmgr.h
+
+fmgr.h fmgrtab.c: ./Gen_fmgrtab.sh ../../include/catalog/pg_proc.h
+	sh $(SHOPTS) Gen_fmgrtab.sh ../../include/catalog/pg_proc.h
+
+clean:
+	rm -f SUBSYS.o fmgr.h fmgrtab.o fmgrtab.c
+	$(MAKE) -C adt   clean 
+	$(MAKE) -C cache clean 
+	$(MAKE) -C error clean 
+	$(MAKE) -C fmgr  clean 
+	$(MAKE) -C hash  clean 
+	$(MAKE) -C init  clean 
+	$(MAKE) -C mmgr  clean 
+	$(MAKE) -C sort  clean 
+	$(MAKE) -C time  clean 
+
+dep: fmgr.h fmgrtab.c
+	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(MAKE) -C adt   dep 
+	$(MAKE) -C cache dep 
+	$(MAKE) -C error dep 
+	$(MAKE) -C fmgr  dep 
+	$(MAKE) -C hash  dep 
+	$(MAKE) -C init  dep 
+	$(MAKE) -C mmgr  dep 
+	$(MAKE) -C sort  dep 
+	$(MAKE) -C time  dep 
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
diff --git a/src/backend/utils/Makefile.inc b/src/backend/utils/Makefile.inc
deleted file mode 100644
index e74e35084a..0000000000
--- a/src/backend/utils/Makefile.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for the utilities modules
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Makefile.inc,v 1.2 1996/08/28 02:13:10 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-utilsdir= $(CURDIR)/utils
-VPATH:= $(VPATH):$(utilsdir):\
-	$(utilsdir)/adt:$(utilsdir)/cache:$(utilsdir)/error:$(utilsdir)/fmgr:\
-	$(utilsdir)/hash:$(utilsdir)/init:$(utilsdir)/mmgr:$(utilsdir)/sort:\
-	$(utilsdir)/time
-
-SUBSRCS=
-include $(utilsdir)/adt/Makefile.inc
-include $(utilsdir)/cache/Makefile.inc
-include $(utilsdir)/error/Makefile.inc
-include $(utilsdir)/fmgr/Makefile.inc
-include $(utilsdir)/hash/Makefile.inc
-include $(utilsdir)/init/Makefile.inc
-include $(utilsdir)/mmgr/Makefile.inc
-include $(utilsdir)/sort/Makefile.inc
-include $(utilsdir)/time/Makefile.inc
-SRCS_UTILS:= $(SUBSRCS) fmgrtab.c
-
-GENFMGRTAB= $(utilsdir)/Gen_fmgrtab.sh
-#GENFMGRTABFILES= fmgr.h fmgrtab.c
-GENFMGRTABFILES= fmgrtab.c
-
-#
-# BKIOPTS is set in ../catalog/Makefile.inc and sets the -D flags for
-# the DATA(...); statements.  Hence, ../catalog/Makefile.inc had better
-# get slurped in prior to this Makefile.inc, or BKIOPTS should be set
-# in a higher directory level.
-#
-$(GENFMGRTABFILES): $(GENFMGRTAB) ../../include/catalog/pg_proc.h
-	cd $(objdir); \
-	sh $(SHOPTS) $(GENFMGRTAB) $(BKIOPTS) ../../include/catalog/pg_proc.h
-
-$(objdir)/fmgrtab.o:  fmgrtab.c
-	$(cc_inobjdir)
-
-POSTGRES_DEPEND+= ${GENFMGRTABFILES}
-
-#
-#${PROG}: ${GENFMGRTABFILES}
-#
-
-CLEANFILES+= $(GENFMGRTABFILES)
-
-HEADERS+= acl.h array.h bit.h builtins.h catcache.h datum.h \
-	dynamic_loader.h elog.h exc.h excid.h fcache.h fmgrtab.h \
-	geo-decls.h hsearch.h inval.h lselect.h lsyscache.h mcxt.h \
-	memutils.h module.h nabstime.h oidcompos.h palloc.h  \
-	portal.h psort.h rel.h rel2.h relcache.h sets.h \
-	syscache.h tqual.h
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
new file mode 100644
index 0000000000..954582a0b0
--- /dev/null
+++ b/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
+
diff --git a/src/backend/utils/adt/Makefile.inc b/src/backend/utils/adt/Makefile.inc
deleted file mode 100644
index 9a7d353f17..0000000000
--- a/src/backend/utils/adt/Makefile.inc
+++ /dev/null
@@ -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
-
diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile
new file mode 100644
index 0000000000..c944479c58
--- /dev/null
+++ b/src/backend/utils/cache/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/cache
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.1 1996/10/27 09:53:26 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o fcache.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/utils/cache/Makefile.inc b/src/backend/utils/cache/Makefile.inc
deleted file mode 100644
index c6a688e5e8..0000000000
--- a/src/backend/utils/cache/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/cache
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:06 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= catcache.c inval.c rel.c relcache.c syscache.c lsyscache.c fcache.c
-
diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile
new file mode 100644
index 0000000000..154b95e314
--- /dev/null
+++ b/src/backend/utils/error/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/error
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.1 1996/10/27 09:53:33 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = assert.o elog.o exc.o excabort.o excid.o format.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/utils/error/Makefile.inc b/src/backend/utils/error/Makefile.inc
deleted file mode 100644
index 2c3d469669..0000000000
--- a/src/backend/utils/error/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/error
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= assert.c elog.c exc.c excabort.c excid.c format.c
diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile
new file mode 100644
index 0000000000..b214470578
--- /dev/null
+++ b/src/backend/utils/fmgr/Makefile
@@ -0,0 +1,45 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/fmgr
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.1 1996/10/27 09:53:40 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+ifeq ($(PORTNAME), linux)
+# LINUX_ELF tells us to use the ELF dynamic load facilities that come with
+# Linux.
+ifdef LINUX_ELF
+CFLAGS+=-DLINUX_ELF
+endif
+endif
+
+OBJS = dfmgr.o fmgr.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/utils/fmgr/Makefile.inc b/src/backend/utils/fmgr/Makefile.inc
deleted file mode 100644
index 1961554431..0000000000
--- a/src/backend/utils/fmgr/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/fmgr
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= dfmgr.c fmgr.c 
-
diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile
new file mode 100644
index 0000000000..79d0c194dd
--- /dev/null
+++ b/src/backend/utils/hash/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/hash
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.1 1996/10/27 09:53:48 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = dynahash.o hashfn.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/utils/hash/Makefile.inc b/src/backend/utils/hash/Makefile.inc
deleted file mode 100644
index 3f9710488e..0000000000
--- a/src/backend/utils/hash/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/hash
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/hash/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:08 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= dynahash.c hashfn.c
diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
new file mode 100644
index 0000000000..4ce8f93030
--- /dev/null
+++ b/src/backend/utils/init/Makefile
@@ -0,0 +1,40 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/init
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.1 1996/10/27 09:54:01 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS += $(INCLUDE_OPT)
+# The following defines really ought to go in config.h 
+CFLAGS += -DPOSTGRESDIR='"$(POSTGRESDIR)"' -DPGDATADIR='"$(DATADIR)"' \
+          -DPOSTPORT='"$(POSTPORT)"'
+
+OBJS = enbl.o findbe.o globals.o magic.o miscinit.o postinit.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/utils/init/Makefile.inc b/src/backend/utils/init/Makefile.inc
deleted file mode 100644
index d773037f36..0000000000
--- a/src/backend/utils/init/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/init
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:08 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= enbl.c findbe.c globals.c magic.c miscinit.c postinit.c
diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile
new file mode 100644
index 0000000000..d855f61e1d
--- /dev/null
+++ b/src/backend/utils/mmgr/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/mmgr
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.1 1996/10/27 09:54:06 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = aset.o mcxt.o palloc.o portalmem.o oset.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/utils/mmgr/Makefile.inc b/src/backend/utils/mmgr/Makefile.inc
deleted file mode 100644
index 6a4a67a81d..0000000000
--- a/src/backend/utils/mmgr/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/mmgr
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:09 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= aset.c mcxt.c palloc.c portalmem.c oset.c
-
diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile
new file mode 100644
index 0000000000..14096e3abd
--- /dev/null
+++ b/src/backend/utils/sort/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/sort
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.1 1996/10/27 09:54:15 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = lselect.o psort.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/utils/sort/Makefile.inc b/src/backend/utils/sort/Makefile.inc
deleted file mode 100644
index 4775407aca..0000000000
--- a/src/backend/utils/sort/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/sort
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:10 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= lselect.c psort.c
diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile
new file mode 100644
index 0000000000..38c7c2f56c
--- /dev/null
+++ b/src/backend/utils/time/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for utils/time
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.1 1996/10/27 09:54:25 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
+              -I../../include \
+              -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = tqual.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/utils/time/Makefile.inc b/src/backend/utils/time/Makefile.inc
deleted file mode 100644
index 5e5d842e34..0000000000
--- a/src/backend/utils/time/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-#    Makefile for utils/time
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/time/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:22:10 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= tqual.c