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

Commit7f43165

Browse files
committed
Make src/backend/port/*.c file location dependent only on configure.in.
1 parenteb335a0 commit7f43165

File tree

3 files changed

+29
-22
lines changed

3 files changed

+29
-22
lines changed

‎contrib/pg_controldata/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.5 2001/09/06 10:49:29 petere Exp $
1+
# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.6 2002/07/18 03:59:49 momjian Exp $
22

33
subdir = contrib/pg_controldata
44
top_builddir = ../..
55
include$(top_builddir)/src/Makefile.global
66

77
PROGRAM = pg_controldata
8-
OBJS= pg_controldata.o pg_crc.o$(SNPRINTF)
8+
OBJS= pg_controldata.o pg_crc.o$(notdir$(SNPRINTF))
99

1010
pg_crc.c:$(top_srcdir)/src/backend/utils/hash/pg_crc.c
1111
rm -f$@&&$(LN_S)$<.
1212

13-
# this only gets done if configure finds system doesn't have snprintf()
14-
snprintf.c:$(top_srcdir)/src/backend/port/snprintf.c
13+
ifdefSNPRINTF
14+
$(basename$(notdir$(SNPRINTF))).c:$(basename$(SNPRINTF)).c
1515
rm -f$@&&$(LN_S)$<.
16+
endif
1617

1718
EXTRA_CLEAN = pg_crc.c snprintf.c
1819

‎contrib/pg_resetxlog/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.3 2001/09/06 10:49:30 petere Exp $
1+
# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.4 2002/07/18 03:59:49 momjian Exp $
22

33
subdir = contrib/pg_resetxlog
44
top_builddir = ../..
55
include$(top_builddir)/src/Makefile.global
66

77
PROGRAM = pg_resetxlog
8-
OBJS= pg_resetxlog.o pg_crc.o$(SNPRINTF)
8+
OBJS= pg_resetxlog.o pg_crc.o$(notdir$(SNPRINTF))
99

1010
pg_crc.c:$(top_srcdir)/src/backend/utils/hash/pg_crc.c
1111
rm -f$@&&$(LN_S)$<.
1212

13-
# this only gets done if configure finds system doesn't have snprintf()
14-
snprintf.c:$(top_srcdir)/src/backend/port/snprintf.c
13+
ifdefSNPRINTF
14+
$(basename$(notdir$(SNPRINTF))).c:$(basename$(SNPRINTF)).c
1515
rm -f$@&&$(LN_S)$<.
16+
endif
1617

1718
EXTRA_CLEAN = pg_crc.c snprintf.c
1819

‎src/interfaces/libpq/Makefile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.62 2002/06/14 04:23:17 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.63 2002/07/18 03:59:49 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/interfaces/libpq
1212
top_builddir = ../../..
1313
include$(top_builddir)/src/Makefile.global
1414

15+
1516
# shared library parameters
1617
NAME= pq
1718
SO_MAJOR_VERSION= 2
@@ -21,12 +22,13 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconf
2122

2223
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
2324
pqexpbuffer.o dllist.o md5.o pqsignal.o fe-secure.o\
24-
$(INET_ATON)$(SNPRINTF)$(STRERROR)
25+
$(notdir$(INET_ATON))$(notdir$(SNPRINTF))$(notdir$(STRERROR))
2526

2627
ifdefMULTIBYTE
2728
OBJS+= wchar.o encnames.o
2829
endif
2930

31+
3032
# Add libraries that libpq depends (or might depend) on into the
3133
# shared library link. (The order in which you list them here doesn't
3234
# matter.)
@@ -37,32 +39,35 @@ all: all-lib
3739

3840
# Shared library stuff
3941
include$(top_srcdir)/src/Makefile.shlib
40-
41-
42-
# We use several backend modules verbatim, but since we need to
43-
# compile with appropriate options to build a shared lib, we can't
44-
# necessarily use the same object files as the backend uses. Instead,
45-
# symlink the source files in here and build our own object file.
46-
4742
backend_src =$(top_srcdir)/src/backend
4843

44+
4945
dllist.c:$(backend_src)/lib/dllist.c
5046
rm -f$@&&$(LN_S)$<.
5147

5248
md5.c:$(backend_src)/libpq/md5.c
5349
rm -f$@&&$(LN_S)$<.
5450

51+
# We use several backend modules verbatim, but since we need to
52+
# compile with appropriate options to build a shared lib, we can't
53+
# necessarily use the same object files as the backend uses. Instead,
54+
# symlink the source files in here and build our own object file.
5555
# this only gets done if configure finds system doesn't have inet_aton()
56-
inet_aton.c:$(backend_src)/port/inet_aton.c
56+
57+
ifdefINET_ATON
58+
$(basename$(notdir$(INET_ATON))).c:$(basename$(INET_ATON)).c
5759
rm -f$@&&$(LN_S)$<.
60+
endif
5861

59-
# this only gets done if configure finds system doesn't have snprintf()
60-
snprintf.c:$(backend_src)/port/snprintf.c
62+
ifdefSNPRINTF
63+
$(basename$(notdir$(SNPRINTF))).c:$(basename$(SNPRINTF)).c
6164
rm -f$@&&$(LN_S)$<.
65+
endif
6266

63-
# this only gets done if configure finds system doesn't have strerror()
64-
strerror.c:$(backend_src)/port/strerror.c
67+
ifdefSTRERROR
68+
$(basename$(notdir$(STRERROR))).c:$(basename$(STRERROR)).c
6569
rm -f$@&&$(LN_S)$<.
70+
endif
6671

6772
ifdefMULTIBYTE
6873
wchar.c :% :$(backend_src)/utils/mb/%

0 commit comments

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