Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit227015b

Browse files
author
Bryan Henderson
committed
Standardize all LDADD to LD_ADD.
1 parent068a4c5 commit227015b

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

‎src/Makefile.global‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.81 1997/01/03 06:07:18 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.82 1997/01/05 21:16:54 bryanh Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -45,21 +45,23 @@
4545
# of the port.
4646

4747
# The name of the port. Valid choices are:
48-
# aix IBM on AIX 3.2.5
4948
# alpha DEC Alpha AXP on OSF/1 2.0
50-
# BSD44_derived OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
51-
# bsdi BSD/OS 2.0, 2.01, 2.1
52-
# dgux DG/UX 5.4R3.10
5349
# hpux HP PA-RISC on HP-UX 9.0
5450
# i386_solaris i386 Solaris
55-
# irix5 SGI MIPS on IRIX 5.3
56-
# linux Intel x86 on Linux 1.2 and Linux ELF
57-
# (For non-ELF Linux, see LINUX_ELF below).
58-
# next Motorola MC68K or Intel x86 on NeXTSTEP 3.2
5951
# sparc_solaris SUN SPARC on Solaris 2.4
6052
# sunos4 SUN SPARC on SunOS 4.1.3
61-
# svr4 Intel x86 on Intel SVR4
6253
# ultrix4 DEC MIPS on Ultrix 4.4
54+
# linux Intel x86 on Linux 1.2 and Linux ELF
55+
# (For non-ELF Linux, see LINUX_ELF below).
56+
# BSD44_derived OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
57+
# bsdi BSD/OS 2.0, 2.01, 2.1
58+
# aix IBM on AIX 3.2.5
59+
# irix5 SGI MIPS on IRIX 5.3
60+
# dgux DG/UX 5.4R3.10
61+
# Some hooks are provided for
62+
# svr4 Intel x86 on Intel SVR4
63+
# next Motorola MC68K or Intel x86 on NeXTSTEP 3.2
64+
# but these are guaranteed not to work as of yet.
6365
#
6466
# Note that portname is defined here to be UNDEFINED to remind you
6567
# to change it in Makefile.custom.
@@ -779,6 +781,6 @@ CFLAGS+= -D$(PORTNAME)
779781

780782
# include port-specific flags
781783
CFLAGS+= $(CFLAGS_BE)
782-
LDADD+= $(LDADD_BE)
784+
LD_ADD+= $(LDADD_BE)
783785
LDFLAGS+= $(LDFLAGS_BE)
784786

‎src/backend/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.17 1996/11/23 09:51:57 bryanh Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.18 1997/01/05 21:17:21 bryanh Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -62,7 +62,7 @@ endif
6262
all: postgres$(EXP) global1.bki.source local1_template1.bki.source
6363

6464
postgres: postgres_group1 postgres_group2 postgres_group3 postgres_group4
65-
$(CC)$(LDFLAGS) -o postgres$(OBJS)$(LDADD)
65+
$(CC)$(LDFLAGS) -o postgres$(OBJS)$(LD_ADD)
6666

6767
postgres_group1:
6868
$(MAKE) -C access all
@@ -98,7 +98,7 @@ global1.bki.source local1_template1.bki.source:
9898
# The postgres.o target is needed by the rule in Makefile.global that
9999
# creates the exports file when MAKE_EXPORTS = true.
100100
postgres.o:$(OBJS)
101-
$(CC)$(LDFLAGS) -r -o postgres.o$(OBJS)$(LDADD)
101+
$(CC)$(LDFLAGS) -r -o postgres.o$(OBJS)$(LD_ADD)
102102

103103

104104
############################################################################
@@ -208,7 +208,7 @@ $(BINDIR) $(LIBDIR) $(HEADERDIR):
208208
# are up to date. It saves the time of doing all the submakes.
209209
.PHONY: quick
210210
quick:$(OBJS)
211-
$(CC)$(LDFLAGS) -o postgres$(OBJS)$(LDADD)
211+
$(CC)$(LDFLAGS) -o postgres$(OBJS)$(LD_ADD)
212212

213213
#
214214
# Build the file, "./ID", used by the "gid" (grep-for-identifier) tool

‎src/test/regress/Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.11 1996/12/02 06:31:08 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.12 1997/01/05 21:17:36 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -16,8 +16,6 @@ include ../../Makefile.global
1616

1717
CFLAGS+= -I$(LIBPQDIR) -I../../include
1818

19-
LDADD+= -L$(LIBPQDIR) -lpq
20-
2119
#
2220
# DLOBJS is the dynamically-loaded object file. The regression test uses
2321
# this when it does a CREATE FUNCTION ... LANGUAGE 'C').

‎src/tutorial/Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for tutorial
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.4 1996/11/18 06:07:52 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.5 1997/01/05 21:17:45 bryanh Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,8 +13,6 @@ include ../Makefile.global
1313

1414
CFLAGS+= -I$(LIBPQDIR) -I../../include
1515

16-
LDADD+= -L$(LIBPQDIR) -lpq
17-
1816
#
1917
# DLOBJS is the dynamically-loaded object files. The "funcs" queries
2018
# include CREATE FUNCTIONs that load routines from these files.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp