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

Commit317f375

Browse files
committed
Rename SLSUFF to DLSUFFIX
1 parent4a820de commit317f375

File tree

7 files changed

+39
-39
lines changed

7 files changed

+39
-39
lines changed

‎src/Makefile.global

Lines changed: 6 additions & 6 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.71 1996/11/1802:23:16 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.72 1996/11/1806:07:12 momjian Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -289,7 +289,7 @@ endif
289289
# Shared libraries.
290290
# This is overridden for many PORTNAMEs below.
291291

292-
SLSUFF= .so
292+
DLSUFFIX= .so
293293

294294
#----------------------------------------------------------------------
295295
ifeq ($(PORTNAME), BSD44_derived)
@@ -476,7 +476,7 @@ INSTALL= bsdinst
476476
RANLIB= touch
477477

478478
CFLAGS_SL= +z
479-
SLSUFF= .sl
479+
DLSUFFIX= .sl
480480

481481
%.sl: %.o
482482
$(LD) -b -o $@ $<
@@ -547,10 +547,10 @@ endif
547547

548548
ifeq ($(PORTNAME), linux)
549549
ifndef LINUX_ELF
550-
SLSUFF= .o
550+
DLSUFFIX= .o
551551
LDADD_BE= -ldld
552552
else
553-
SLSUFF= .so
553+
DLSUFFIX= .so
554554
LDADD_BE= -ldl
555555
LDFLAGS_BE= -rdynamic
556556
endif
@@ -675,7 +675,7 @@ INSTALL= /usr/bin/install
675675
RANLIB= /usr/bin/ranlib
676676

677677
CFLAGS_SL= -G 0
678-
SLSUFF= .o
678+
DLSUFFIX= .o
679679

680680
endif
681681

‎src/mk/postgres.user.mk

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
# values. This is a feeble attempt to provide "portable" scripts.
2020
#_CWD_ - current working directory
2121
#_OBJWD_ - where the generated files (eg. object files) are
22-
#_SLSUFF_ - suffix of the shared library or object for
23-
# dynamic loading
22+
#_DLSUFFIX_ - suffix of the dynamic loading
2423
#_USER_ - the login of the user
2524
#
2625
# Copyright (c) 1994-5, Regents of the University of California
2726
#
2827
#
2928
# IDENTIFICATION
30-
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.user.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
29+
# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.user.mk,v 1.2 1996/11/18 06:07:23 momjian Exp $
3130
#
3231
#-------------------------------------------------------------------------
3332

@@ -42,7 +41,7 @@ CFLAGS+= -I$(includedir) $(CFLAGS_SL)
4241
C=`pwd`;\
4342
sed -e"s:_CWD_:$$C:g"\
4443
-e"s:_OBJWD_:$$C/$(objdir):g"\
45-
-e"s:_SLSUFF_:$(SLSUFF):g"\
44+
-e"s:_DLSUFFIX_:$(DLSUFFIX):g"\
4645
-e"s/_USER_/$$USER/g"<$*.source>$(objdir)/$*.sql
4746

4847
#How to create a dynamic lib
@@ -58,7 +57,7 @@ CFLAGS+= -I$(includedir) $(CFLAGS_SL)
5857
C="`pwd`/";\
5958
sed -e"s:_CWD_:$$C:g"\
6059
-e"s:_OBJWD_:$$C/$(objdir):g"\
61-
-e"s:_SLSUFF_:$(SLSUFF):g"\
60+
-e"s:_DLSUFFIX_:$(DLSUFFIX):g"\
6261
-e"s/_USER_/$$USER/g"<$*.source>$(objdir)/$*.sh
6362

6463
#
@@ -71,9 +70,9 @@ endif
7170
#
7271
# plus shared libraries
7372
#
74-
ifdefSLSUFF
75-
ifneq ($(SLSUFF), '.o')
76-
CREATEFILES+=$(DLOBJS:.so=$(SLSUFF))
73+
ifdefDLSUFFIX
74+
ifneq ($(DLSUFFIX), '.o')
75+
CREATEFILES+=$(DLOBJS:.so=$(DLSUFFIX))
7776
endif
7877
endif
7978

‎src/test/regress/Makefile

Lines changed: 4 additions & 4 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.9 1996/11/13 10:36:17 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.10 1996/11/18 06:07:29 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -22,7 +22,7 @@ LDADD+= -L$(LIBPQDIR) -lpq
2222
# DLOBJS is the dynamically-loaded object file. The regression test uses
2323
# this when it does a CREATE FUNCTION ... LANGUAGE 'C').
2424
#
25-
DLOBJS= regress$(SLSUFF)
25+
DLOBJS= regress$(DLSUFFIX)
2626

2727
#
2828
# ... plus test query inputs
@@ -69,7 +69,7 @@ expected.out: expected.input
6969
C="`pwd`";\
7070
sed -e"s:_CWD_:$$C:g"\
7171
-e"s:_OBJWD_:$$C:g"\
72-
-e"s:_SLSUFF_:$(SLSUFF):g"\
72+
-e"s:_DLSUFFIX_:$(DLSUFFIX):g"\
7373
-e"s/_USER_/$$USER/g"< expected.input> expected.out
7474
@echo"YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."
7575

@@ -81,7 +81,7 @@ expected.out: expected.input
8181
C=`pwd`;\
8282
sed -e"s:_CWD_:$$C:g"\
8383
-e"s:_OBJWD_:$$C:g"\
84-
-e"s:_SLSUFF_:$(SLSUFF):g"\
84+
-e"s:_DLSUFFIX_:$(DLSUFFIX):g"\
8585
-e"s/_USER_/$$USER/g"<$<>$@
8686

8787
clean:

‎src/test/regress/create.source

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
CREATE FUNCTION circle_in(opaque)
1111
RETURNS circle
12-
AS '_OBJWD_/regress_SLSUFF_'
12+
AS '_OBJWD_/regress_DLSUFFIX_'
1313
LANGUAGE 'c';
1414

1515
CREATE FUNCTION circle_out(opaque)
1616
RETURNS opaque
17-
AS '_OBJWD_/regress_SLSUFF_'
17+
AS '_OBJWD_/regress_DLSUFFIX_'
1818
LANGUAGE 'c';
1919

2020
CREATE TYPE circle (
@@ -288,33 +288,33 @@ CREATE FUNCTION user_relns()
288288

289289
CREATE FUNCTION pt_in_circle(point, circle)
290290
RETURNS int4
291-
AS '_OBJWD_/regress_SLSUFF_'
291+
AS '_OBJWD_/regress_DLSUFFIX_'
292292
LANGUAGE 'c';
293293

294294
CREATE FUNCTION overpaid(emp)
295295
RETURNS bool
296-
AS '_OBJWD_/regress_SLSUFF_'
296+
AS '_OBJWD_/regress_DLSUFFIX_'
297297
LANGUAGE 'c';
298298

299299
CREATE FUNCTION boxarea(box)
300300
RETURNS int4
301-
AS '_OBJWD_/regress_SLSUFF_'
301+
AS '_OBJWD_/regress_DLSUFFIX_'
302302
LANGUAGE 'c';
303303

304304
CREATE FUNCTION interpt_pp(path, path)
305305
RETURNS point
306-
AS '_OBJWD_/regress_SLSUFF_'
306+
AS '_OBJWD_/regress_DLSUFFIX_'
307307
LANGUAGE 'c';
308308

309309
CREATE FUNCTION reverse_c16(char16)
310310
RETURNS char16
311-
AS '_OBJWD_/regress_SLSUFF_'
311+
AS '_OBJWD_/regress_DLSUFFIX_'
312312
LANGUAGE 'c';
313313

314314
--
315315
-- FUNCTION DYNAMIC LOADING
316316
--
317-
LOAD '_OBJWD_/regress_SLSUFF_'
317+
LOAD '_OBJWD_/regress_DLSUFFIX_'
318318

319319
--
320320
-- CLASS POPULATION

‎src/test/regress/expected.input

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ destroydb: database destroy failed on regression.
44
=============== creating new regression database... =================
55
QUERY: CREATE FUNCTION circle_in(opaque)
66
RETURNS circle
7-
AS '_CWD_/obj/regress_SLSUFF_'
7+
AS '_CWD_/obj/regress_DLSUFFIX_'
88
LANGUAGE 'c';
99
NOTICE:ProcedureCreate: type 'circle' is not yet defined
1010
QUERY: CREATE FUNCTION circle_out(opaque)
1111
RETURNS opaque
12-
AS '_CWD_/obj/regress_SLSUFF_'
12+
AS '_CWD_/obj/regress_DLSUFFIX_'
1313
LANGUAGE 'c';
1414
QUERY: CREATE TYPE circle (
1515
internallength = 24,
@@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns()
211211
LANGUAGE 'sql';
212212
QUERY: CREATE FUNCTION pt_in_circle(point, circle)
213213
RETURNS int4
214-
AS '_CWD_/obj/regress_SLSUFF_'
214+
AS '_CWD_/obj/regress_DLSUFFIX_'
215215
LANGUAGE 'c';
216216
QUERY: CREATE FUNCTION overpaid(emp)
217217
RETURNS bool
218-
AS '_CWD_/obj/regress_SLSUFF_'
218+
AS '_CWD_/obj/regress_DLSUFFIX_'
219219
LANGUAGE 'c';
220220
QUERY: CREATE FUNCTION boxarea(box)
221221
RETURNS int4
222-
AS '_CWD_/obj/regress_SLSUFF_'
222+
AS '_CWD_/obj/regress_DLSUFFIX_'
223223
LANGUAGE 'c';
224224
QUERY: CREATE FUNCTION interpt_pp(path, path)
225225
RETURNS point
226-
AS '_CWD_/obj/regress_SLSUFF_'
226+
AS '_CWD_/obj/regress_DLSUFFIX_'
227227
LANGUAGE 'c';
228228
QUERY: CREATE FUNCTION reverse_c16(char16)
229229
RETURNS char16
230-
AS '_CWD_/obj/regress_SLSUFF_'
230+
AS '_CWD_/obj/regress_DLSUFFIX_'
231231
LANGUAGE 'c';
232-
QUERY: LOAD '_CWD_/obj/regress_SLSUFF_'
232+
QUERY: LOAD '_CWD_/obj/regress_DLSUFFIX_'
233233
COPY onek FROM '_CWD_/data/onek.data';
234234
QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
235235
QUERY: INSERT INTO tenk2 VALUES (tenk1.*);

‎src/tutorial/C-code/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ include ../../Makefile.global
33

44
CFLAGS+= -I../../include -I$(LIBPQDIR)
55

6-
all: complex$(SLSUFF) funcs$(SLSUFF)
6+
all: complex$(DLSUFFIX) funcs$(DLSUFFIX)
77

88
clean:
9-
rm -f complex$(SLSUFF) funcs$(SLSUFF)
9+
rm -f complex$(DLSUFFIX) funcs$(DLSUFFIX)
10+

‎src/tutorial/Makefile

Lines changed: 3 additions & 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.3 1996/11/13 10:36:24 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.4 1996/11/18 06:07:52 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,7 +19,7 @@ LDADD+= -L$(LIBPQDIR) -lpq
1919
# DLOBJS is the dynamically-loaded object files. The "funcs" queries
2020
# include CREATE FUNCTIONs that load routines from these files.
2121
#
22-
DLOBJS= complex$(SLSUFF) funcs$(SLSUFF)
22+
DLOBJS= complex$(DLSUFFIX) funcs$(DLSUFFIX)
2323

2424
QUERIES= advanced.sql basics.sql complex.sql funcs.sql syscat.sql
2525
#
@@ -39,7 +39,7 @@ all: $(QUERIES)
3939
C=`pwd`;\
4040
sed -e"s:_CWD_:$$C:g"\
4141
-e"s:_OBJWD_:$$C:g"\
42-
-e"s:_SLSUFF_:$(SLSUFF):g"\
42+
-e"s:_DLSUFFIX_:$(DLSUFFIX):g"\
4343
-e"s/_USER_/$$USER/g"<$<>$@
4444

4545
funcs.sql::$(DLOBJS)

0 commit comments

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