summaryrefslogtreecommitdiff
path: root/src/backend/storage/Makefile
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-07-13 16:07:14 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-07-13 16:07:14 +0000
commit8a3cbc84efdf3ba205b5aece838ffbe1d548e851 (patch)
tree7aaf56fd94baa0097c1bb0682998fc9b27be2c97 /src/backend/storage/Makefile
parent9191d684a7dad1bba82427b760ff61912df1d7d0 (diff)
downloadpostgresql-8a3cbc84efdf3ba205b5aece838ffbe1d548e851.tar.gz
Repair parallel make in backend tree (and make it really parallel).
Make Gen_fmgrtab.sh reasonably robust against concurrent invocation.
Diffstat (limited to 'src/backend/storage/Makefile')
-rw-r--r--src/backend/storage/Makefile36
1 files changed, 16 insertions, 20 deletions
diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile
index 73dcf0cf1b..812fd53e80 100644
--- a/src/backend/storage/Makefile
+++ b/src/backend/storage/Makefile
@@ -1,34 +1,30 @@
-#-------------------------------------------------------------------------
#
-# Makefile--
-# Makefile for the storage manager subsystem
+# Makefile for the storage manager subsystem
#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.6 1999/12/13 22:33:33 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.7 2000/07/13 16:06:48 petere Exp $
#
-#-------------------------------------------------------------------------
-SRCDIR= ../..
+subdir = src/backend/storage
+top_builddir = ../../..
include ../../Makefile.global
-all: submake SUBSYS.o
+SUBDIRS := buffer file ipc large_object lmgr page smgr
+SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)
-OBJS = buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o \
- lmgr/SUBSYS.o page/SUBSYS.o smgr/SUBSYS.o
+all: SUBSYS.o
-DIRS = buffer file ipc large_object lmgr page smgr
+SUBSYS.o: $(SUBDIROBJS)
+ $(LD) $(LDREL) $(LDOUT) $@ $^
-SUBSYS.o: $(OBJS)
- $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive)
-.PHONY: submake clean dep
-
-submake:
- for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
+.PHONY: $(SUBDIRS:%=%-recursive)
+$(SUBDIRS:%=%-recursive):
+ $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
clean:
+ for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
rm -f SUBSYS.o
- for i in $(DIRS); do $(MAKE) -C $$i clean; done
-.DEFAULT:
- for i in $(DIRS); do $(MAKE) -C $$i $@; done
+dep depend:
+ for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done