mirror of
https://github.com/postgres/postgres.git
synced 2025-11-12 05:01:15 +03:00
Hi,
Attached you'll find a (big) patch that fixes make dep and make depend in all Makefiles where I found it to be appropriate. It also removes the dependency in Makefile.global for NAMEDATALEN and OIDNAMELEN by making backend/catalog/genbki.sh and bin/initdb/initdb.sh a little smarter. This no longer requires initdb.sh that is turned into initdb with a sed script when installing Postgres, hence initdb.sh should be renamed to initdb (after the patch has been applied :-) ) This patch is against the 6.3 sources, as it took a while to complete. Please review and apply, Cheers, Jeroen van Vianen
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
# Makefile for the storage manager subsystem
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.3 1997/06/11 01:13:10 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.4 1998/04/06 00:24:53 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -16,36 +16,19 @@ all: submake 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
|
||||
|
||||
DIRS = buffer file ipc large_object lmgr page smgr
|
||||
|
||||
SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
.PHONY: submake clean dep
|
||||
|
||||
submake:
|
||||
$(MAKE) -C buffer SUBSYS.o
|
||||
$(MAKE) -C file SUBSYS.o
|
||||
$(MAKE) -C ipc SUBSYS.o
|
||||
$(MAKE) -C large_object SUBSYS.o
|
||||
$(MAKE) -C lmgr SUBSYS.o
|
||||
$(MAKE) -C page SUBSYS.o
|
||||
$(MAKE) -C smgr SUBSYS.o
|
||||
for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o
|
||||
$(MAKE) -C buffer clean
|
||||
$(MAKE) -C file clean
|
||||
$(MAKE) -C ipc clean
|
||||
$(MAKE) -C large_object clean
|
||||
$(MAKE) -C lmgr clean
|
||||
$(MAKE) -C page clean
|
||||
$(MAKE) -C smgr clean
|
||||
for i in $(DIRS); do $(MAKE) -C $$i clean; done
|
||||
|
||||
.DEFAULT:
|
||||
$(MAKE) -C buffer $@
|
||||
$(MAKE) -C file $@
|
||||
$(MAKE) -C ipc $@
|
||||
$(MAKE) -C large_object $@
|
||||
$(MAKE) -C lmgr $@
|
||||
$(MAKE) -C page $@
|
||||
$(MAKE) -C smgr $@
|
||||
|
||||
for i in $(DIRS); do $(MAKE) -C $$i $@; done
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/buffer
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.6 1997/12/30 04:01:25 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.7 1998/04/06 00:24:58 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o
|
||||
|
||||
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/file
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.4 1997/12/20 00:27:17 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.5 1998/04/06 00:25:05 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = fd.o
|
||||
|
||||
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/ipc
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.6 1997/12/20 00:27:25 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.7 1998/04/06 00:25:14 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o \
|
||||
sinvaladt.o spin.o
|
||||
@@ -24,7 +22,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/large_object
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.5 1997/12/20 00:27:35 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.6 1998/04/06 00:25:30 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = inv_api.o
|
||||
|
||||
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/lmgr
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.5 1997/12/20 00:27:44 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.6 1998/04/06 00:25:43 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = lmgr.o lock.o multi.o proc.o single.o
|
||||
|
||||
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/page
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.5 1997/12/20 00:27:50 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.6 1998/04/06 00:25:50 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = bufpage.o itemptr.o
|
||||
|
||||
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
@@ -4,16 +4,14 @@
|
||||
# Makefile for storage/smgr
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.5 1997/12/20 00:27:56 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.6 1998/04/06 00:25:58 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = md.o mm.o smgr.o smgrtype.o
|
||||
|
||||
@@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
depend dep:
|
||||
$(CC) -MM $(INCLUDE_OPT) *.c >depend
|
||||
$(CC) -MM $(CFLAGS) *.c >depend
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
||||
Reference in New Issue
Block a user