Commit 1f48290a authored by Bruce Momjian's avatar Bruce Momjian

In libpq/Makefile, use OBJS += as a way to break up long link lines into

something that can be documented.
parent fe7a32fc
...@@ -29,18 +29,19 @@ endif ...@@ -29,18 +29,19 @@ endif
# platforms require special flags. # platforms require special flags.
LIBS := $(LIBS:-lpgport=) LIBS := $(LIBS:-lpgport=)
# 'filter' is used for libpgport C files that are needed by libpq if
# identified by configure, and we optionally add pgsleep.o below.
# We can't use Makefile variables here because the MSVC build system scrapes # We can't use Makefile variables here because the MSVC build system scrapes
# OBJS from this file. # OBJS from this file.
# The last two lines come from backend/libpq and utils/mb.
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \ fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \
libpq-events.o \ libpq-events.o
inet_net_ntop.o noblock.o pgstrcasecmp.o thread.o \ # libpgport C files we always use
$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o, $(LIBOBJS)) \ OBJS += inet_net_ntop.o noblock.o pgstrcasecmp.o thread.o
ip.o md5.o \ # libpgport C files that are needed if identified by configure
encnames.o wchar.o OBJS += $(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o, $(LIBOBJS))
# backend/libpq
OBJS += ip.o md5.o
# utils/mb
OBJS += encnames.o wchar.o
ifeq ($(PORTNAME), cygwin) ifeq ($(PORTNAME), cygwin)
override shlib = cyg$(NAME)$(DLSUFFIX) override shlib = cyg$(NAME)$(DLSUFFIX)
...@@ -134,9 +135,7 @@ clean distclean: clean-lib ...@@ -134,9 +135,7 @@ clean distclean: clean-lib
# Might be left over from a Win32 client-only build # Might be left over from a Win32 client-only build
rm -f pg_config_paths.h rm -f pg_config_paths.h
rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c thread.c rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c thread.c
# optional libpgport files
rm -f crypt.c getaddrinfo.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c rm -f crypt.c getaddrinfo.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c
# optional Win32
rm -f pgsleep.c rm -f pgsleep.c
rm -f md5.c ip.c rm -f md5.c ip.c
rm -f encnames.c wchar.c rm -f encnames.c wchar.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment