diff options
| author | Bruce Momjian | 2005-08-23 20:48:47 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2005-08-23 20:48:47 +0000 |
| commit | a970a8cb95bd3f4d3a4b924904d248c9dd322ee0 (patch) | |
| tree | 4fbb5211d2a35c9e86323d1907deaf2bf63a6be2 /src/interfaces/libpq/Makefile | |
| parent | eef7e30cc13158cb1fde7f4b148dd14e83331a35 (diff) | |
Back out incorrect commit.
Diffstat (limited to 'src/interfaces/libpq/Makefile')
| -rw-r--r-- | src/interfaces/libpq/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 45751e7397e..f496d595ecb 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.135 2005/08/23 20:45:06 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.136 2005/08/23 20:48:46 momjian Exp $ # #------------------------------------------------------------------------- @@ -43,7 +43,9 @@ 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 @@ -57,7 +59,7 @@ SHLIB_LINK += -lshfolder -lwsock32 -lws2_32 $(filter -leay32 -lssleay32 -lcomerr endif -all: def-files $(srcdir)/libpq.rc all-lib +all: $(PTHREAD_H_WIN32) def-files $(srcdir)/libpq.rc all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib @@ -120,6 +122,11 @@ $(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: |