Index: src/interfaces/libpq/Makefile
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/libpq/Makefile,v
retrieving revision 1.109
diff -c -c -r1.109 Makefile
*** src/interfaces/libpq/Makefile	24 May 2004 01:01:38 -0000	1.109
--- src/interfaces/libpq/Makefile	19 Jun 2004 04:40:39 -0000
***************
*** 25,32 ****
--- 25,38 ----
  	fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \
  	dllist.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o \
  	$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o, $(LIBOBJS))
+ 
  ifeq ($(PORTNAME), win32)
  OBJS+=win32.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=yes
+ endif
  endif
  
  
***************
*** 39,45 ****
  endif
  
  
! all: all-lib
  
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
--- 45,51 ----
  endif
  
  
! all: $(PTHREAD_H_WIN32) all-lib
  
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
***************
*** 66,71 ****
--- 72,82 ----
  	rm -f $@ && $(LN_S) $< .
  
  
+ ifeq ($(PTHREAD_H_WIN32))
+ pthread.h : % : $(top_srcdir)/src/interfaces/libpq/pthread.h.win
+ 	rm -f $@ && $(LN_S) $< .
+ endif
+ 
  install: all installdirs install-lib
  	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
  	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
***************
*** 79,82 ****
  	rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h
  
  clean distclean maintainer-clean: clean-lib
! 	rm -f $(OBJS) crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c dllist.c md5.c ip.c encnames.c wchar.c
--- 90,93 ----
  	rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h
  
  clean distclean maintainer-clean: clean-lib
! 	rm -f $(OBJS) crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c dllist.c md5.c ip.c encnames.c wchar.c pthread.h