aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access
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/access
parent1e39d14ff33f7ac436bbbd0b46a3e31faafed561 (diff)
downloadpostgresql-b0d6f0aa639610f47bed818f7bc4e584cd9a391b.tar.gz
postgresql-b0d6f0aa639610f47bed818f7bc4e584cd9a391b.zip
Simplify make files, add full dependencies.
Diffstat (limited to 'src/backend/access')
-rw-r--r--src/backend/access/Makefile46
-rw-r--r--src/backend/access/Makefile.inc36
-rw-r--r--src/backend/access/common/Makefile43
-rw-r--r--src/backend/access/common/Makefile.inc16
-rw-r--r--src/backend/access/gist/Makefile37
-rw-r--r--src/backend/access/gist/Makefile.inc16
-rw-r--r--src/backend/access/hash/Makefile38
-rw-r--r--src/backend/access/hash/Makefile.inc18
-rw-r--r--src/backend/access/heap/Makefile37
-rw-r--r--src/backend/access/heap/Makefile.inc14
-rw-r--r--src/backend/access/index/Makefile37
-rw-r--r--src/backend/access/index/Makefile.inc14
-rw-r--r--src/backend/access/nbtree/Makefile38
-rw-r--r--src/backend/access/nbtree/Makefile.inc15
-rw-r--r--src/backend/access/rtree/Makefile37
-rw-r--r--src/backend/access/rtree/Makefile.inc14
-rw-r--r--src/backend/access/transam/Makefile37
-rw-r--r--src/backend/access/transam/Makefile.inc14
18 files changed, 350 insertions, 157 deletions
diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile
new file mode 100644
index 00000000000..0bd4e1770f7
--- /dev/null
+++ b/src/backend/access/Makefile
@@ -0,0 +1,46 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for the access methods module
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.1 1996/10/27 09:45:42 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+all: SUBSYS.o
+
+SUBSYS.o:
+ $(MAKE) -C common SUBSYS.o
+ $(MAKE) -C gist SUBSYS.o
+ $(MAKE) -C hash SUBSYS.o
+ $(MAKE) -C heap SUBSYS.o
+ $(MAKE) -C index SUBSYS.o
+ $(MAKE) -C rtree SUBSYS.o
+ $(MAKE) -C nbtree SUBSYS.o
+ $(MAKE) -C transam SUBSYS.o
+ $(LD) -r -o SUBSYS.o \
+ common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o \
+ index/SUBSYS.o rtree/SUBSYS.o nbtree/SUBSYS.o transam/SUBSYS.o
+
+clean:
+ rm -f SUBSYS.o
+ $(MAKE) -C common clean
+ $(MAKE) -C gist clean
+ $(MAKE) -C hash clean
+ $(MAKE) -C heap clean
+ $(MAKE) -C index clean
+ $(MAKE) -C rtree clean
+ $(MAKE) -C nbtree clean
+ $(MAKE) -C transam clean
+
+.DEFAULT:
+ $(MAKE) -C common $@
+ $(MAKE) -C gist $@
+ $(MAKE) -C hash $@
+ $(MAKE) -C heap $@
+ $(MAKE) -C index $@
+ $(MAKE) -C rtree $@
+ $(MAKE) -C nbtree $@
+ $(MAKE) -C transam $@
+
diff --git a/src/backend/access/Makefile.inc b/src/backend/access/Makefile.inc
deleted file mode 100644
index eeff8b43be5..00000000000
--- a/src/backend/access/Makefile.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for the access methods module
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/Attic/Makefile.inc,v 1.2 1996/08/26 06:26:37 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-accdir=$(CURDIR)/access
-VPATH:=$(VPATH):$(accdir):\
- $(accdir)/common:$(accdir)/gist:$(accdir)/hash:$(accdir)/heap:\
- $(accdir)/index:$(accdir)/rtree:$(accdir)/nbtree:$(accdir)/transam
-
-
-SUBSRCS=
-include $(accdir)/common/Makefile.inc
-include $(accdir)/gist/Makefile.inc
-include $(accdir)/hash/Makefile.inc
-include $(accdir)/heap/Makefile.inc
-include $(accdir)/index/Makefile.inc
-include $(accdir)/rtree/Makefile.inc
-include $(accdir)/nbtree/Makefile.inc
-include $(accdir)/transam/Makefile.inc
-SRCS_ACCESS:= $(SUBSRCS)
-
-HEADERS+= attnum.h funcindex.h genam.h gist.h hash.h \
- heapam.h hio.h htup.h ibit.h iqual.h istrat.h \
- itup.h nbtree.h printtup.h relscan.h rtree.h \
- sdir.h skey.h strat.h transam.h tupdesc.h tupmacs.h \
- valid.h xact.h
-
diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
new file mode 100644
index 00000000000..e199a40bca1
--- /dev/null
+++ b/src/backend/access/common/Makefile
@@ -0,0 +1,43 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/common
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.1 1996/10/27 09:45:49 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \
+ scankey.o tupdesc.o
+
+all: SUBSYS.o
+
+SUBSYS.o: $(OBJS)
+ $(LD) -r -o SUBSYS.o $(OBJS)
+
+heapvalid.o tupdesc.o: ../../fmgr.h
+
+../../fmgr.h:
+ $(MAKE) -C ../.. fmgr.h
+
+dep: ../../fmgr.h
+ $(CC) -MM $(INCLUDE_OPT) *.c >depend
+
+clean:
+ rm -f SUBSYS.o $(OBJS)
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+
diff --git a/src/backend/access/common/Makefile.inc b/src/backend/access/common/Makefile.inc
deleted file mode 100644
index 5d5dd476274..00000000000
--- a/src/backend/access/common/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/common
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/common/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:09 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= heaptuple.c heapvalid.c indextuple.c indexvalid.c printtup.c \
- scankey.c tupdesc.c
-
diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile
new file mode 100644
index 00000000000..2963accb9cf
--- /dev/null
+++ b/src/backend/access/gist/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/gist
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.1 1996/10/27 09:45:57 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = gist.o gistget.o gistscan.o giststrat.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/access/gist/Makefile.inc b/src/backend/access/gist/Makefile.inc
deleted file mode 100644
index 8519ab0a582..00000000000
--- a/src/backend/access/gist/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/rtree (R-Tree access method)
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# /usr/local/devel/pglite/cvs/src/backend/access/rtree/Makefile.inc,v 1.2 1995/03/21 06:50:48 andrew Exp
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= gist.c gistget.c gistscan.c giststrat.c
-
-
diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile
new file mode 100644
index 00000000000..72f69e616f1
--- /dev/null
+++ b/src/backend/access/hash/Makefile
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/hash
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.1 1996/10/27 09:46:08 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \
+ hashsearch.o hashstrat.o hashutil.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/access/hash/Makefile.inc b/src/backend/access/hash/Makefile.inc
deleted file mode 100644
index 8ea221bc264..00000000000
--- a/src/backend/access/hash/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/hash (hash access method)
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:10 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= hash.c hashfunc.c hashinsert.c hashovfl.c hashpage.c hashscan.c \
- hashsearch.c hashstrat.c hashutil.c
-
-
-
diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile
new file mode 100644
index 00000000000..d2de8cfe91f
--- /dev/null
+++ b/src/backend/access/heap/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/heap
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.1 1996/10/27 09:46:16 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = heapam.o hio.o stats.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/access/heap/Makefile.inc b/src/backend/access/heap/Makefile.inc
deleted file mode 100644
index f4f4bbb7031..00000000000
--- a/src/backend/access/heap/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/heap
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:11 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= heapam.c hio.c stats.c
diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile
new file mode 100644
index 00000000000..221a6b2a413
--- /dev/null
+++ b/src/backend/access/index/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/index
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.1 1996/10/27 09:46:25 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = genam.o indexam.o istrat.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/access/index/Makefile.inc b/src/backend/access/index/Makefile.inc
deleted file mode 100644
index 0bc58830c8f..00000000000
--- a/src/backend/access/index/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/index
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/index/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:11 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= genam.c indexam.c istrat.c
diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile
new file mode 100644
index 00000000000..3170bbe4f7b
--- /dev/null
+++ b/src/backend/access/nbtree/Makefile
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/nbtree
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.1 1996/10/27 09:46:32 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \
+ nbtstrat.o nbtutils.o nbtsort.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/access/nbtree/Makefile.inc b/src/backend/access/nbtree/Makefile.inc
deleted file mode 100644
index 50854008c01..00000000000
--- a/src/backend/access/nbtree/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/nbtree (btree acess methods)
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:11 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= nbtcompare.c nbtinsert.c nbtpage.c nbtree.c nbtscan.c nbtsearch.c \
- nbtstrat.c nbtutils.c nbtsort.c
diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile
new file mode 100644
index 00000000000..6b88382a2e0
--- /dev/null
+++ b/src/backend/access/rtree/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/rtree
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.1 1996/10/27 09:46:40 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.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/access/rtree/Makefile.inc b/src/backend/access/rtree/Makefile.inc
deleted file mode 100644
index a93a5e53290..00000000000
--- a/src/backend/access/rtree/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/rtree (R-Tree access method)
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= rtget.c rtproc.c rtree.c rtscan.c rtstrat.c
diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile
new file mode 100644
index 00000000000..f95cf269c74
--- /dev/null
+++ b/src/backend/access/transam/Makefile
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for access/transam
+#
+# IDENTIFICATION
+# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.1 1996/10/27 09:46:48 bryanh Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
+ -I../../include \
+ -I../../../include
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = transam.o transsup.o varsup.o xact.o xid.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/access/transam/Makefile.inc b/src/backend/access/transam/Makefile.inc
deleted file mode 100644
index c4f5b95a0ae..00000000000
--- a/src/backend/access/transam/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.inc--
-# Makefile for access/transam
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:13 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SUBSRCS+= transam.c transsup.c varsup.c xact.c xid.c