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

Commita9b02ec

Browse files
committed
In libpq/Makefile, merge PERM_PGPORT and OPT_PGPORT into a single
Makefile variable PGPORT, for clarity.
1 parent5f4b3d7 commita9b02ec

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎src/interfaces/libpq/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ ifneq ($(PORTNAME), win32)
2424
overrideCFLAGS +=$(PTHREAD_CFLAGS)
2525
endif
2626

27-
# Need to recompile anylibpgport object files because we need these
28-
# object files to use the same compile flags as libpq; some
29-
# platforms require special flags for all libpq object files.
27+
# Need to recompile anyexternal C files because we need
28+
#allobject files to use the same compile flags as libpq; some
29+
# platforms require special flags.
3030
LIBS :=$(LIBS:-lpgport=)
3131

32-
# external object files that are always used by libpq
33-
BACKEND_LIBPQ = md5 ip
34-
UTILS_MB = encnames wchar
35-
PERM_PGPORT = inet_net_ntop noblock pgstrcasecmp thread
32+
# libpgport C files that are always used by libpq
33+
PGPORT = inet_net_ntop noblock pgstrcasecmp thread
3634
ifeq ($(PORTNAME), win32)
37-
PERM_PGPORT += pgsleep
35+
PGPORT += pgsleep
3836
endif
37+
# libpgport C files are used by libpq if identified by configure
38+
PGPORT +=$(basename$(filter$(addsuffix .o, crypt getaddrinfo inet_aton open snprintf strerror strlcpy win32error),$(LIBOBJS)))
3939

40-
41-
# pgport object files are used by libpq if identified by configure
42-
OPT_PGPORT =$(basename$(filter$(addsuffix .o, crypt getaddrinfo inet_aton open snprintf strerror strlcpy win32error),$(LIBOBJS)))
40+
# other external C files
41+
BACKEND_LIBPQ = md5 ip
42+
UTILS_MB =encnames wchar
4343

4444
OBJS=fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
4545
fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o\
4646
libpq-events.o\
47-
$(addsuffix .o,$(PERM_PGPORT)$(OPT_PGPORT)$(BACKEND_LIBPQ)$(UTILS_MB))
47+
$(addsuffix .o,$(PGPORT)$(BACKEND_LIBPQ)$(UTILS_MB))
4848

4949
ifeq ($(PORTNAME), cygwin)
5050
overrideshlib = cyg$(NAME)$(DLSUFFIX)
@@ -88,7 +88,7 @@ backend_src = $(top_srcdir)/src/backend
8888
# necessarily use the same object files as the backend uses. Instead,
8989
# we symlink the source files in here and build our own object files.
9090

91-
$(addsuffix .c,$(PERM_PGPORT)$(OPT_PGPORT)):% :$(top_srcdir)/src/port/%
91+
$(addsuffix .c,$(PGPORT)):% :$(top_srcdir)/src/port/%
9292
rm -f$@&&$(LN_S)$<.
9393

9494
$(addsuffix .c,$(BACKEND_LIBPQ)):% :$(backend_src)/libpq/%
@@ -131,7 +131,7 @@ uninstall: uninstall-lib
131131
rm -f'$(DESTDIR)$(datadir)/pg_service.conf.sample'
132132

133133
cleandistclean: clean-lib
134-
rm -f$(OBJS) pg_config_paths.h pthread.h libpq.rc$(addsuffix .c,$(BACKEND_LIBPQ)$(UTILS_MB)$(PERM_PGPORT)$(OPT_PGPORT))
134+
rm -f$(OBJS) pg_config_paths.h pthread.h libpq.rc$(addsuffix .c,$(PGPORT)$(BACKEND_LIBPQ)$(UTILS_MB))
135135
# Might be left over from a Win32 client-only build
136136
rm -f pg_config_paths.h
137137

0 commit comments

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