Build server libpgport with all non-FRONTEND object files. This is to

fix a Win32 bug where pipe.c included a file that used FRONTEND, but it
wasn't on the server-build list.

diff --git a/src/port/Makefile b/src/port/Makefile
index d6b35eb4340ad8b4f96c9897c011cba98252d46a..80d69767387d451b742f0092d5a5a35273d5ae1b 100644 (file)
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -26,12 +26,8 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-# Replace object files that use FRONTEND define
-LIBOBJS_SRV := $(LIBOBJS)
-LIBOBJS_SRV := $(patsubst dirmod.o,dirmod_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst exec.o,exec_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst getaddrinfo.o,getaddrinfo_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst thread.o,thread_srv.o, $(LIBOBJS_SRV))
+# Replace all object files so they use FRONTEND define
+LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
 
 all: libpgport.a libpgport_srv.a
 
@@ -57,13 +53,7 @@ path.o: path.c pg_config_paths.h
 libpgport_srv.a: $(LIBOBJS_SRV)
        $(AR) $(AROPT) $@ $^
 
-dirmod_srv.o: dirmod.c
-       $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
-
-exec_srv.o: exec.c
-       $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
-
-getaddrinfo_srv.o: getaddrinfo.c
+%_srv.o: %.c
        $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
 
 # No thread flags for server version