diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-08-23 21:02:05 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-08-23 21:02:05 +0000 |
| commit | 43bf3a6bc658d634e073dcb4ea3580dd9053a3b1 (patch) | |
| tree | 40d357f8408e146b23f3e005798677a2340ba331 /src/interfaces/libpq/Makefile | |
| parent | f2cec8760581aa9d036c659ecf9ad74907709cc1 (diff) | |
| download | postgresql-43bf3a6bc658d634e073dcb4ea3580dd9053a3b1.tar.gz | |
The attached patch updates the thread test program to run stand-alone on
Windows. The test itself is bypassed in configure as discussed, and
libpq has been updated appropriately to allow it to build in thread-safe
mode.
Dave Page
Diffstat (limited to 'src/interfaces/libpq/Makefile')
| -rw-r--r-- | src/interfaces/libpq/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index f496d595ec..9a61803cce 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.136 2005/08/23 20:48:46 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.137 2005/08/23 21:02:03 momjian Exp $ # #------------------------------------------------------------------------- @@ -43,9 +43,7 @@ libpqrc.o: libpq.rc windres -i libpq.rc -o libpqrc.o ifeq ($(enable_thread_safety), yes) -# This doesn't work yet because configure test fails. 2004-06-19 OBJS += pthread-win32.o -PTHREAD_H_WIN32 = pthread.h endif endif @@ -59,7 +57,7 @@ SHLIB_LINK += -lshfolder -lwsock32 -lws2_32 $(filter -leay32 -lssleay32 -lcomerr endif -all: $(PTHREAD_H_WIN32) def-files $(srcdir)/libpq.rc all-lib +all: def-files $(srcdir)/libpq.rc all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib @@ -122,11 +120,6 @@ $(srcdir)/blibpqdll.def: exports.txt $(srcdir)/libpq.rc: libpq.rc.in $(top_builddir)/src/Makefile.global sed -e 's/\(VERSION.*\),0 *$$/\1,'`date '+%y%j' | sed 's/^0*//'`'/' < $< > $@ -ifneq ($(PTHREAD_H_WIN32), "") -pthread.h: $(top_srcdir)/src/interfaces/libpq/pthread.h.win - rm -f $@ && $(LN_S) $< . -endif - fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h $(top_builddir)/src/port/pg_config_paths.h: |