diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-05-08 02:18:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-05-08 02:18:59 +0000 |
| commit | 9083bdd28879ac78ca046352dd2c465f7d45f226 (patch) | |
| tree | 27282432c0ed72dd974bdd24ba15dfc8737c3f36 | |
| parent | 478335a1be75c0d4bbf4e31e0cdfe36af8edf0be (diff) | |
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.
| -rw-r--r-- | src/port/Makefile | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/port/Makefile b/src/port/Makefile index e17f324c0d4..059c4a44eb4 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -15,7 +15,7 @@ # for use only by the backend binaries # # IDENTIFICATION -# $PostgreSQL: pgsql/src/port/Makefile,v 1.29 2005/09/27 17:39:35 tgl Exp $ +# $PostgreSQL: pgsql/src/port/Makefile,v 1.29.2.1 2006/05/08 02:18:59 momjian Exp $ # #------------------------------------------------------------------------- @@ -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 |