mirror of
https://github.com/postgres/postgres.git
synced 2025-11-09 06:21:09 +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:
Bruce Momjian
@@ -4,7 +4,7 @@
|
||||
# Makefile for optimizer
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.4 1997/06/11 01:12:55 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.5 1998/04/06 00:23:04 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@@ -15,28 +15,18 @@ all: submake SUBSYS.o
|
||||
|
||||
OBJS = path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o geqo/SUBSYS.o
|
||||
|
||||
DIRS = path plan prep util geqo
|
||||
|
||||
SUBSYS.o: $(OBJS)
|
||||
$(LD) -r -o SUBSYS.o $(OBJS)
|
||||
|
||||
.PHONY: submake clean
|
||||
.PHONY: submake clean dep depend
|
||||
submake:
|
||||
$(MAKE) -C path SUBSYS.o
|
||||
$(MAKE) -C plan SUBSYS.o
|
||||
$(MAKE) -C prep SUBSYS.o
|
||||
$(MAKE) -C util SUBSYS.o
|
||||
$(MAKE) -C geqo SUBSYS.o
|
||||
for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
|
||||
|
||||
clean:
|
||||
rm -f SUBSYS.o
|
||||
$(MAKE) -C path clean
|
||||
$(MAKE) -C plan clean
|
||||
$(MAKE) -C prep clean
|
||||
$(MAKE) -C util clean
|
||||
$(MAKE) -C geqo clean
|
||||
for i in $(DIRS); do $(MAKE) -C $$i clean; done
|
||||
|
||||
.DEFAULT:
|
||||
$(MAKE) -C path $@
|
||||
$(MAKE) -C plan $@
|
||||
$(MAKE) -C prep $@
|
||||
$(MAKE) -C util $@
|
||||
$(MAKE) -C geqo $@
|
||||
for i in $(DIRS); do $(MAKE) -C $$i $@; done
|
||||
|
||||
@@ -5,22 +5,19 @@
|
||||
#
|
||||
# Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $Id: Makefile,v 1.9 1997/12/20 00:24:17 scrappy Exp $
|
||||
# $Id: Makefile,v 1.10 1998/04/06 00:23:07 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
ifeq ($(CC), gcc)
|
||||
CFLAGS+= -Wno-error
|
||||
endif
|
||||
|
||||
|
||||
OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
|
||||
geqo_params.o geqo_paths.o geqo_pool.o geqo_recombination.o \
|
||||
geqo_selection.o \
|
||||
@@ -34,7 +31,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 optimizer/path
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.5 1997/12/20 00:24:23 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.6 1998/04/06 00:23:17 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = allpaths.o clausesel.o costsize.o hashutils.o indxpath.o \
|
||||
joinpath.o joinrels.o joinutils.o mergeutils.o orindxpath.o \
|
||||
@@ -27,7 +25,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 optimizer/plan
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.6 1998/02/13 03:36:51 vadim Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.7 1998/04/06 00:23:31 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o
|
||||
|
||||
@@ -25,7 +23,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 optimizer/prep
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.6 1997/12/20 00:24:38 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.7 1998/04/06 00:23:48 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = prepqual.o preptlist.o prepunion.o
|
||||
|
||||
@@ -25,7 +23,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 optimizer/util
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.5 1997/12/20 00:24:45 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.6 1998/04/06 00:23:55 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR = ../../..
|
||||
include ../../../Makefile.global
|
||||
|
||||
INCLUDE_OPT = -I../..
|
||||
|
||||
CFLAGS+=$(INCLUDE_OPT)
|
||||
CFLAGS += -I../..
|
||||
|
||||
OBJS = clauseinfo.o clauses.o indexnode.o internal.o plancat.o \
|
||||
joininfo.o keys.o ordering.o pathnode.o relnode.o tlist.o var.o
|
||||
@@ -26,7 +24,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