From 3ffd3d82dbbd86d4d66b3eb7cc9f08434db6dd55 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 9 Dec 1999 19:15:45 +0000 Subject: [PATCH] Make LD -r as macros that can be changed for QNX. --- src/Makefile.shlib | 4 ++-- src/backend/Makefile | 4 ++-- src/backend/access/Makefile | 4 ++-- src/backend/access/common/Makefile | 4 ++-- src/backend/access/gist/Makefile | 4 ++-- src/backend/access/hash/Makefile | 4 ++-- src/backend/access/heap/Makefile | 4 ++-- src/backend/access/index/Makefile | 4 ++-- src/backend/access/nbtree/Makefile | 4 ++-- src/backend/access/rtree/Makefile | 4 ++-- src/backend/access/transam/Makefile | 4 ++-- src/backend/bootstrap/Makefile | 4 ++-- src/backend/catalog/Makefile | 4 ++-- src/backend/commands/Makefile | 4 ++-- src/backend/executor/Makefile | 4 ++-- src/backend/lib/Makefile | 4 ++-- src/backend/libpq/Makefile | 4 ++-- src/backend/main/Makefile | 4 ++-- src/backend/nodes/Makefile | 4 ++-- src/backend/optimizer/Makefile | 4 ++-- src/backend/optimizer/geqo/Makefile | 4 ++-- src/backend/optimizer/path/Makefile | 4 ++-- src/backend/optimizer/plan/Makefile | 4 ++-- src/backend/optimizer/prep/Makefile | 4 ++-- src/backend/optimizer/util/Makefile | 4 ++-- src/backend/parser/Makefile | 4 ++-- src/backend/port/Makefile.in | 4 ++-- src/backend/port/nextstep/Makefile | 2 +- src/backend/port/sunos4/Makefile | 4 ++-- src/backend/postmaster/Makefile | 4 ++-- src/backend/regex/Makefile | 4 ++-- src/backend/rewrite/Makefile | 4 ++-- src/backend/storage/Makefile | 4 ++-- src/backend/storage/buffer/Makefile | 4 ++-- src/backend/storage/file/Makefile | 4 ++-- src/backend/storage/ipc/Makefile | 4 ++-- src/backend/storage/large_object/Makefile | 4 ++-- src/backend/storage/lmgr/Makefile | 4 ++-- src/backend/storage/page/Makefile | 4 ++-- src/backend/storage/smgr/Makefile | 4 ++-- src/backend/tcop/Makefile | 4 ++-- src/backend/tioga/Makefile | 4 ++-- src/backend/utils/Makefile | 4 ++-- src/backend/utils/adt/Makefile | 4 ++-- src/backend/utils/cache/Makefile | 4 ++-- src/backend/utils/error/Makefile | 4 ++-- src/backend/utils/fmgr/Makefile | 4 ++-- src/backend/utils/hash/Makefile | 4 ++-- src/backend/utils/init/Makefile | 4 ++-- src/backend/utils/mb/Makefile | 4 ++-- src/backend/utils/misc/Makefile | 4 ++-- src/backend/utils/mmgr/Makefile | 4 ++-- src/backend/utils/sort/Makefile | 4 ++-- src/backend/utils/time/Makefile | 4 ++-- src/makefiles/Makefile.bsd | 2 +- src/makefiles/Makefile.freebsd | 2 +- 56 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 4b1beeaf2a..169e59311d 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.16 1999/10/13 11:38:34 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.17 1999/12/09 19:14:22 momjian Exp $ # #------------------------------------------------------------------------- @@ -89,7 +89,7 @@ ifeq ($(PORTNAME), bsdi) install-shlib-dep := install-shlib shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LD := shlicc - LDFLAGS_SL += -O -r + LDFLAGS_SL += -O $(LDREL) CFLAGS += $(CFLAGS_SL) endif endif diff --git a/src/backend/Makefile b/src/backend/Makefile index 6d2990469b..367a603fb4 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -34,7 +34,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.39 1999/11/14 17:12:42 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.40 1999/12/09 19:14:23 momjian Exp $ # #------------------------------------------------------------------------- @@ -109,7 +109,7 @@ catalog/global1.description catalog/local1_template1.description: # The postgres.o target is needed by the rule in Makefile.global that # creates the exports file when MAKE_EXPORTS = true. postgres.o: $(OBJS) - $(CC) -r -o postgres.o $(OBJS) $(LDFLAGS) + $(CC) $(LDREL) -o postgres.o $(OBJS) $(LDFLAGS) ############################################################################ # The following targets are specified in make commands that appear in the diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile index ceedd8da84..4a976d7e7e 100644 --- a/src/backend/access/Makefile +++ b/src/backend/access/Makefile @@ -4,7 +4,7 @@ # Makefile for the access methods module # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.3 1997/06/11 01:11:30 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.4 1999/12/09 19:14:24 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o \ all: submake SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) .PHONY: submake submake: diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index 00e2562ea4..426aeccdbb 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,7 +4,7 @@ # Makefile for access/common # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.13 1999/05/26 12:55:05 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.14 1999/12/09 19:14:25 momjian Exp $ # #------------------------------------------------------------------------- @@ -23,7 +23,7 @@ OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) heaptuple.o heapvalid.o tupdesc.o: ../../fmgr.h diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index bb93730d47..f793637d42 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -4,7 +4,7 @@ # Makefile for access/gist # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.6 1998/04/06 00:20:49 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.7 1999/12/09 19:14:26 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = gist.o gistget.o gistscan.o giststrat.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index 9f65126dcc..07d8ff1fd8 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -4,7 +4,7 @@ # Makefile for access/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.6 1998/04/06 00:20:58 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.7 1999/12/09 19:14:27 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,7 +19,7 @@ OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index b876c6099e..73de16e8ce 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,7 +4,7 @@ # Makefile for access/heap # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.6 1998/04/06 00:21:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.7 1999/12/09 19:14:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = heapam.o hio.o stats.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index c57c4d5237..46c3db10af 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -4,7 +4,7 @@ # Makefile for access/index # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.6 1998/04/06 00:21:24 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.7 1999/12/09 19:14:29 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = genam.o indexam.o istrat.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index b0ad3f3670..486a0169d3 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -4,7 +4,7 @@ # Makefile for access/nbtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.6 1998/04/06 00:21:34 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.7 1999/12/09 19:14:30 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,7 +19,7 @@ OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile index 9bb5fdfa0f..7fcbc1e946 100644 --- a/src/backend/access/rtree/Makefile +++ b/src/backend/access/rtree/Makefile @@ -4,7 +4,7 @@ # Makefile for access/rtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.6 1998/04/06 00:21:41 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.7 1999/12/09 19:14:31 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 46252fa71d..46b5f9e180 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,7 +4,7 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.8 1999/10/24 20:42:27 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.9 1999/12/09 19:14:33 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index ccf8f46a24..3655c07320 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -4,7 +4,7 @@ # Makefile for the bootstrap module # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.15 1998/07/26 04:30:17 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.16 1999/12/09 19:14:34 momjian Exp $ # # # We must build bootparse.c and bootscanner.c with yacc and lex and sed, @@ -37,7 +37,7 @@ OBJS= bootparse.o bootscanner.o bootstrap.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) # bootstrap.o's dependency on bootstrap_tokens.h is computed by the # make depend, but we state it here explicitly anyway because diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index cf6e586927..4d7b4f6eac 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -4,7 +4,7 @@ # Makefile for catalog # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.18 1999/11/22 17:55:56 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.19 1999/12/09 19:14:35 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ all: SUBSYS.o global1.bki.source local1_template1.bki.source \ global1.description local1_template1.description SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) GENBKI= ./genbki.sh diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index 70bae54175..fd1969d360 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -4,7 +4,7 @@ # Makefile for commands # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.20 1999/10/26 16:32:46 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.21 1999/12/09 19:14:36 momjian Exp $ # #------------------------------------------------------------------------- @@ -25,7 +25,7 @@ OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) # The following declares a hard-coded dependency on parse.h since, # if compiled without make dep, comment.c would get compiled before diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile index ea0b20e9b4..d22a4a7ffa 100644 --- a/src/backend/executor/Makefile +++ b/src/backend/executor/Makefile @@ -4,7 +4,7 @@ # Makefile for executor # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.9 1999/11/23 20:06:49 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.10 1999/12/09 19:14:38 momjian Exp $ # #------------------------------------------------------------------------- @@ -24,7 +24,7 @@ OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index 2dcd4eeb64..2cce45a771 100644 --- a/src/backend/lib/Makefile +++ b/src/backend/lib/Makefile @@ -4,7 +4,7 @@ # Makefile for lib (miscellaneous stuff) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.10 1998/03/30 16:46:24 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.11 1999/12/09 19:14:39 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = bit.o fstack.o hasht.o lispsort.o stringinfo.o dllist.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile index af032d6924..ca462be65f 100644 --- a/src/backend/libpq/Makefile +++ b/src/backend/libpq/Makefile @@ -4,7 +4,7 @@ # Makefile for libpq subsystem (backend half of libpq interface) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.14 1999/04/25 03:27:15 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.15 1999/12/09 19:14:40 momjian Exp $ # #------------------------------------------------------------------------- @@ -31,7 +31,7 @@ OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o portal.o portalbuf.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) be-dumpdata.o be-pqexec.o: ../fmgr.h diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index a01b1092ac..0d0e292002 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -4,7 +4,7 @@ # Makefile for main # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.5 1998/04/06 00:22:51 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.6 1999/12/09 19:14:41 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = main.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 91bdef03d2..570bf89c5b 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -4,7 +4,7 @@ # Makefile for nodes # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.8 1999/02/23 07:24:08 thomas Exp $ +# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.9 1999/12/09 19:14:42 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = nodeFuncs.o nodes.o list.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) outfuncs.o: ../parse.h diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile index ce5b8ac8a1..9f76818c3e 100644 --- a/src/backend/optimizer/Makefile +++ b/src/backend/optimizer/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.5 1998/04/06 00:23:04 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.6 1999/12/09 19:14:43 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ 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) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) .PHONY: submake clean dep depend submake: diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 4864300e64..0079cb591b 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,7 +5,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Id: Makefile,v 1.11 1999/02/15 03:22:00 momjian Exp $ +# $Id: Makefile,v 1.12 1999/12/09 19:14:44 momjian Exp $ # #------------------------------------------------------------------------- @@ -28,7 +28,7 @@ OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 5e903ce666..d8a10b2a07 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.10 1999/11/23 20:06:54 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.11 1999/12/09 19:14:45 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = allpaths.o clausesel.o costsize.o indxpath.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index 5164f1c2a9..4a8392e3cd 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.7 1998/04/06 00:23:31 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.8 1999/12/09 19:14:46 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 8ece58c872..48da661fba 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.8 1998/09/03 02:34:32 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.9 1999/12/09 19:14:47 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index f221e87b01..524e68d657 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.9 1999/08/16 02:17:56 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.10 1999/12/09 19:14:49 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 63403cae17..b076248e99 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -4,7 +4,7 @@ # Makefile for parser # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.21 1999/10/18 02:42:31 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.22 1999/12/09 19:14:50 momjian Exp $ # #------------------------------------------------------------------------- @@ -28,7 +28,7 @@ OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) gram.c parse.h: gram.y $(YACC) $(YFLAGS) $< diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index 4ca72e3dc9..0ad9aeb0c4 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -13,7 +13,7 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.17 1998/08/01 19:30:27 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.18 1999/12/09 19:14:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -28,7 +28,7 @@ OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) .PHONY: clean dep diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile index 706dbffeb7..acae650948 100644 --- a/src/backend/port/nextstep/Makefile +++ b/src/backend/port/nextstep/Makefile @@ -17,7 +17,7 @@ OBJS = dynloader.o port.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend diff --git a/src/backend/port/sunos4/Makefile b/src/backend/port/sunos4/Makefile index 1ee7d3ab4f..1c14df7edb 100644 --- a/src/backend/port/sunos4/Makefile +++ b/src/backend/port/sunos4/Makefile @@ -4,7 +4,7 @@ # Makefile for port/sparc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.2 1997/12/20 00:26:30 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.3 1999/12/09 19:14:53 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = strtol.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 3cb191b9a0..73e7872c1b 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,7 +4,7 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.8 1998/04/06 00:24:26 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.9 1999/12/09 19:14:54 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = postmaster.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 47b9439b8a..c474406691 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,7 +4,7 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.9 1999/05/21 06:27:54 ishii Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.10 1999/12/09 19:14:55 momjian Exp $ # #------------------------------------------------------------------------- @@ -26,7 +26,7 @@ endif all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) retest: retest.o SUBSYS.o $(DEBUGOBJ) $(CC) -o retest retest.o SUBSYS.o $(DEBUGOBJ) diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index 786af7502e..bba0eb1ea5 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,7 +4,7 @@ # Makefile for rewrite # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.8 1998/07/26 04:30:37 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.9 1999/12/09 19:14:56 momjian Exp $ # #------------------------------------------------------------------------- @@ -22,7 +22,7 @@ OBJS = rewriteRemove.o rewriteDefine.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile index 4ea56a9769..e0edc71b1a 100644 --- a/src/backend/storage/Makefile +++ b/src/backend/storage/Makefile @@ -4,7 +4,7 @@ # Makefile for the storage manager subsystem # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.4 1998/04/06 00:24:53 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.5 1999/12/09 19:14:58 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,7 +19,7 @@ OBJS = buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o \ DIRS = buffer file ipc large_object lmgr page smgr SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) .PHONY: submake clean dep diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index 298cdbb8d5..9c4e896f83 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.11 1998/06/16 07:18:15 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.12 1999/12/09 19:14:59 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index 766a0c1d1c..3e88b03104 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/file # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.6 1999/10/13 15:02:29 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.7 1999/12/09 19:15:00 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = fd.o buffile.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 340f70d3c8..92fdccf70d 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/ipc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.8 1999/07/22 18:30:07 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.9 1999/12/09 19:15:01 momjian Exp $ # #------------------------------------------------------------------------- @@ -29,7 +29,7 @@ OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index ae6bb06b6a..cfcf8dd2b9 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.6 1998/04/06 00:25:30 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.7 1999/12/09 19:15:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = inv_api.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index 88cd9d060c..f4b22801be 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.9 1998/12/15 12:46:29 vadim Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.10 1999/12/09 19:15:04 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ OBJS = lmgr.o lock.o proc.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 7d2eeada60..5f604244ca 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.6 1998/04/06 00:25:50 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.7 1999/12/09 19:15:06 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = bufpage.o itemptr.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 78da3053ef..209d0d88b8 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.8 1998/07/26 04:30:43 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.9 1999/12/09 19:15:07 momjian Exp $ # #------------------------------------------------------------------------- @@ -22,7 +22,7 @@ OBJS = md.o mm.o smgr.o smgrtype.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 44b755242a..a94d1c7163 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,7 +4,7 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.18 1998/07/26 04:30:46 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.19 1999/12/09 19:15:08 momjian Exp $ # #------------------------------------------------------------------------- @@ -26,7 +26,7 @@ OBJS= dest.o fastpath.o postgres.o pquery.o utility.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) # The following dependencies are picked up by the make dep, but since # not everyone can do make dep, and these are particularly important diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile index 6948fc2f2b..e67b767736 100644 --- a/src/backend/tioga/Makefile +++ b/src/backend/tioga/Makefile @@ -4,7 +4,7 @@ # Makefile for tioga # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.4 1997/12/20 00:28:13 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.5 1999/12/09 19:15:11 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ OBJS = tgRecipe.o Varray.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index b28d37f9d5..344bee6f74 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -4,7 +4,7 @@ # Makefile for utils # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.8 1998/07/26 04:30:50 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.9 1999/12/09 19:15:13 momjian Exp $ # #------------------------------------------------------------------------- @@ -29,7 +29,7 @@ DIRS += mb endif SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) .PHONY: submake clean dep submake: diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index b2999d0d0d..ea9913c2ce 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/adt # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.27 1999/11/17 21:21:50 wieck Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.28 1999/12/09 19:15:16 momjian Exp $ # #------------------------------------------------------------------------- @@ -40,7 +40,7 @@ OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index 9034f85812..89f580fc00 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.10 1999/02/02 03:44:54 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.11 1999/12/09 19:15:18 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,7 +19,7 @@ OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index 20d7a9bc8b..8e3a39d0ad 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/error # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.5 1998/04/06 00:26:45 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.6 1999/12/09 19:15:20 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ 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) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index cf503d2cb8..5775def501 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.6 1998/04/06 00:26:52 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.7 1999/12/09 19:15:23 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = dfmgr.o fmgr.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 419e204069..099a49f9c5 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.5 1998/04/06 00:26:58 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.6 1999/12/09 19:15:26 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = dynahash.o hashfn.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index 0b306fcf69..1d05f460a0 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/init # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.9 1998/07/26 04:31:00 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.10 1999/12/09 19:15:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile index 47180e8004..19dda22260 100644 --- a/src/backend/utils/mb/Makefile +++ b/src/backend/utils/mb/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.3 1999/02/02 18:51:21 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.4 1999/12/09 19:15:31 momjian Exp $ # #------------------------------------------------------------------------- @@ -22,7 +22,7 @@ OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \ all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index dc54a2cc66..e7bcebdb30 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/misc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.9 1998/08/25 21:34:10 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.10 1999/12/09 19:15:33 momjian Exp $ # #------------------------------------------------------------------------- @@ -22,7 +22,7 @@ OBJS = database.o superuser.o trace.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index 3d11b4fd37..9df7005c3c 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.5 1998/04/06 00:27:24 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.6 1999/12/09 19:15:36 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index c680a08923..fc8bad90a9 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/sort # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.7 1999/10/17 22:15:05 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.8 1999/12/09 19:15:39 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = logtape.o tuplesort.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index a9ac73909f..e59fa58849 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/time # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.5 1998/04/06 00:27:42 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.6 1999/12/09 19:15:41 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ OBJS = tqual.o all: SUBSYS.o SUBSYS.o: $(OBJS) - $(LD) -r -o SUBSYS.o $(OBJS) + $(LD) $(LDREL) -o SUBSYS.o $(OBJS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/makefiles/Makefile.bsd b/src/makefiles/Makefile.bsd index 58df0e955d..a791db3b94 100644 --- a/src/makefiles/Makefile.bsd +++ b/src/makefiles/Makefile.bsd @@ -5,7 +5,7 @@ endif ifdef ELF_SYSTEM $(LD) -x -Bshareable -o $@ $< else - $(LD) -x -r -o $<.obj $< + $(LD) $(LDREL) -x -o $<.obj $< @echo building shared object $@ @rm -f $@.pic @${AR} cq $@.pic `lorder $<.obj | tsort` diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd index 7bf4258816..d1b97ac598 100644 --- a/src/makefiles/Makefile.freebsd +++ b/src/makefiles/Makefile.freebsd @@ -6,7 +6,7 @@ endif ifdef ELF_SYSTEM $(LD) -x -shared -o $@ $< else - $(LD) -x -r -o $<.obj $< + $(LD) $(LDREL) -x -o $<.obj $< @echo building shared object $@ @rm -f $@.pic @${AR} cq $@.pic `lorder $<.obj | tsort`