Link libpq after libpgfeutils to satisfy Windows linker.

Some of the non-MSVC Windows buildfarm members seem to need this to avoid
getting "undefined symbol" errors on libpgfeutils' references to libpq.
I could understand that if libpq were a static library, but surely it is
not?  Oh well, at least the extra reference is no more harmful than it is
for libpgcommon or libpgport.

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index ea515fd9de4e155468005082e3b466de3332c6f5..95967893d8226cbc1fde3266d1d1fc972b623c14 100644 (file)
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -17,7 +17,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
-LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
+LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
 
 OBJS=  pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
    pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \

diff --git a/src/bin/pgbench/Makefile b/src/bin/pgbench/Makefile
index 5e608b654b9a3ea62f2efeaa202463d4e6c5cbf7..1503d00e12a858c21987b56d631197007d1ba65f 100644 (file)
--- a/src/bin/pgbench/Makefile
+++ b/src/bin/pgbench/Makefile
@@ -10,7 +10,7 @@ include $(top_builddir)/src/Makefile.global
 OBJS = pgbench.o exprparse.o $(WIN32RES)
 
 override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
-LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
+LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
 
 ifneq ($(PORTNAME), win32)
 override CFLAGS += $(PTHREAD_CFLAGS)

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 6220d0d620f8785cf85f9aff489dfcf214b638fa..d1c3b777c25026ecfff13861b086c068ba73d684 100644 (file)
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
 REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
 
 override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
-LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
+LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
 
 OBJS=  command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
    startup.o prompt.o variables.o large_obj.o describe.o \

diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 4e342ef88875a662213c8b98b0a59f396585151e..8c107b1ba43ad93ded335fa377050c4f2a6a9cc0 100644 (file)
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
 PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb pg_isready
 
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
-LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
+LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
 
 all: $(PROGRAMS)