@@ -29,18 +29,19 @@ endif
2929# platforms require special flags.
3030LIBS :=$(LIBS:-lpgport= )
3131
32- # 'filter' is used for libpgport C files that are needed by libpq if
33- # identified by configure, and we optionally add pgsleep.o below.
3432# We can't use Makefile variables here because the MSVC build system scrapes
3533# OBJS from this file.
36- # The last two lines come from backend/libpq and utils/mb.
3734OBJS =fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
3835fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o\
39- libpq-events.o\
40- inet_net_ntop.o noblock.o pgstrcasecmp.o thread.o\
41- $(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o,$(LIBOBJS ) ) \
42- ip.o md5.o\
43- encnames.o wchar.o
36+ libpq-events.o
37+ # libpgport C files we always use
38+ OBJS += inet_net_ntop.o noblock.o pgstrcasecmp.o thread.o
39+ # libpgport C files that are needed if identified by configure
40+ OBJS +=$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o,$(LIBOBJS ) )
41+ # backend/libpq
42+ OBJS += ip.o md5.o
43+ # utils/mb
44+ OBJS += encnames.o wchar.o
4445
4546ifeq ($(PORTNAME ) , cygwin)
4647override shlib = cyg$(NAME )$(DLSUFFIX )
@@ -134,9 +135,7 @@ clean distclean: clean-lib
134135# Might be left over from a Win32 client-only build
135136rm -f pg_config_paths.h
136137rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c thread.c
137- # optional libpgport files
138138rm -f crypt.c getaddrinfo.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c
139- # optional Win32
140139rm -f pgsleep.c
141140rm -f md5.c ip.c
142141rm -f encnames.c wchar.c