Index: src/interfaces/libpq/bcc32.mak
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/bcc32.mak,v
retrieving revision 1.11
diff -c -c -r1.11 bcc32.mak
*** src/interfaces/libpq/bcc32.mak	13 Nov 2004 03:18:50 -0000	1.11
--- src/interfaces/libpq/bcc32.mak	21 Feb 2005 21:18:50 -0000
***************
*** 42,51 ****
  DEBUG=1
  OUTDIR=.\Debug
  INTDIR=.\Debug
! !else
  OUTDIR=.\Release
  INTDIR=.\Release
! !endif
  
  USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
  
--- 42,53 ----
  DEBUG=1
  OUTDIR=.\Debug
  INTDIR=.\Debug
! !ELSE
  OUTDIR=.\Release
  INTDIR=.\Release
! !ENDIF
! 
! OUTFILENAME=blibpq
  
  USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
  
***************
*** 59,74 ****
  CPP_PROJ	= $(CPP_PROJ) -O -Oi -OS -DNDEBUG
  !endif
  
  LIB32=tlib.exe
  LIB32_FLAGS= 
  LIB32_OBJS= \
! 	"$(OUTDIR)\win32.obj" \
  	"$(INTDIR)\getaddrinfo.obj" \
  	"$(INTDIR)\thread.obj" \
  	"$(INTDIR)\inet_aton.obj" \
  	"$(INTDIR)\crypt.obj" \
  	"$(INTDIR)\noblock.obj" \
- 	"$(INTDIR)\pgstrcasecmp.obj" \
  	"$(INTDIR)\md5.obj" \
  	"$(INTDIR)\ip.obj" \
  	"$(INTDIR)\fe-auth.obj" \
--- 61,108 ----
  CPP_PROJ	= $(CPP_PROJ) -O -Oi -OS -DNDEBUG
  !endif
  
+ CLEAN :
+ 	-@erase "$(INTDIR)\getaddrinfo.obj"
+ 	-@erase "$(INTDIR)\pgstrcasecmp.obj"
+ 	-@erase "$(INTDIR)\thread.obj"
+ 	-@erase "$(INTDIR)\inet_aton.obj"
+ 	-@erase "$(INTDIR)\crypt.obj"
+ 	-@erase "$(INTDIR)\noblock.obj"
+ 	-@erase "$(INTDIR)\md5.obj"
+ 	-@erase "$(INTDIR)\ip.obj"
+ 	-@erase "$(INTDIR)\fe-auth.obj"
+ 	-@erase "$(INTDIR)\fe-protocol2.obj"
+ 	-@erase "$(INTDIR)\fe-protocol3.obj"
+ 	-@erase "$(INTDIR)\fe-connect.obj"
+ 	-@erase "$(INTDIR)\fe-exec.obj"
+ 	-@erase "$(INTDIR)\fe-lobj.obj"
+ 	-@erase "$(INTDIR)\fe-misc.obj"
+ 	-@erase "$(INTDIR)\fe-print.obj"
+ 	-@erase "$(INTDIR)\fe-secure.obj"
+ 	-@erase "$(INTDIR)\pqexpbuffer.obj"
+ 	-@erase "$(INTDIR)\pqsignal.obj"
+ 	-@erase "$(OUTDIR)\libpqdll.obj"
+ 	-@erase "$(OUTDIR)\win32.obj"
+ 	-@erase "$(INTDIR)\wchar.obj"
+ 	-@erase "$(INTDIR)\encnames.obj"
+ 	-@erase "$(INTDIR)\pthread-win32.obj"
+ 	-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
+ 	-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
+ 	-@erase "$(OUTDIR)\libpq.res"
+ 	-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
+ 	-@erase "$(OUTDIR)\$(OUTFILENAME).tds"
+ 	-@erase "$(INTDIR)\pg_config_paths.h"
+ 
  LIB32=tlib.exe
  LIB32_FLAGS= 
  LIB32_OBJS= \
! 	"$(INTDIR)\win32.obj" \
  	"$(INTDIR)\getaddrinfo.obj" \
+ 	"$(INTDIR)\pgstrcasecmp.obj" \
  	"$(INTDIR)\thread.obj" \
  	"$(INTDIR)\inet_aton.obj" \
  	"$(INTDIR)\crypt.obj" \
  	"$(INTDIR)\noblock.obj" \
  	"$(INTDIR)\md5.obj" \
  	"$(INTDIR)\ip.obj" \
  	"$(INTDIR)\fe-auth.obj" \
***************
*** 83,89 ****
  	"$(INTDIR)\pqexpbuffer.obj" \
  	"$(INTDIR)\pqsignal.obj" \
  	"$(INTDIR)\wchar.obj" \
! 	"$(INTDIR)\encnames.obj"
  
  
  RSC=brcc32.exe
--- 117,124 ----
  	"$(INTDIR)\pqexpbuffer.obj" \
  	"$(INTDIR)\pqsignal.obj" \
  	"$(INTDIR)\wchar.obj" \
! 	"$(INTDIR)\encnames.obj" \
! 	"$(INTDIR)\pthread-win32.obj"
  
  
  RSC=brcc32.exe
***************
*** 95,131 ****
  
  ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
  
- CLEAN :
- 	-@erase "$(INTDIR)\getaddrinfo.obj"
- 	-@erase "$(INTDIR)\thread.obj"
- 	-@erase "$(INTDIR)\inet_aton.obj"
- 	-@erase "$(INTDIR)\crypt.obj"
- 	-@erase "$(INTDIR)\md5.obj"
- 	-@erase "$(INTDIR)\ip.obj"
- 	-@erase "$(INTDIR)\fe-auth.obj"
- 	-@erase "$(INTDIR)\fe-protocol2.obj"
- 	-@erase "$(INTDIR)\fe-protocol3.obj"
- 	-@erase "$(INTDIR)\fe-connect.obj"
- 	-@erase "$(INTDIR)\fe-exec.obj"
- 	-@erase "$(INTDIR)\fe-lobj.obj"
- 	-@erase "$(INTDIR)\fe-misc.obj"
- 	-@erase "$(INTDIR)\fe-print.obj"
- 	-@erase "$(INTDIR)\fe-secure.obj"
- 	-@erase "$(INTDIR)\pqexpbuffer.obj"
- 	-@erase "$(INTDIR)\pqsignal.obj"
- 	-@erase "$(OUTDIR)\libpqdll.obj"
- 	-@erase "$(OUTDIR)\win32.obj"
- 	-@erase "$(INTDIR)\wchar.obj"
- 	-@erase "$(INTDIR)\encnames.obj"
- 	-@erase "$(INTDIR)\noblock.obj"
- 	-@erase "$(INTDIR)\pgstrcasecmp.obj"
- 	-@erase "$(OUTDIR)\libpq.res"
- 	-@erase "$(OUTDIR)\blibpq.lib"
- 	-@erase "$(OUTDIR)\blibpqdll.lib"
- 	-@erase "$(OUTDIR)\blibpq.dll"
- 	-@erase "$(OUTDIR)\blibpq.tds"
- 	-@erase "$(INTDIR)\pg_config_paths.h"
- 
  config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
  
  ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
--- 130,135 ----
Index: src/interfaces/libpq/win32.mak
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/win32.mak,v
retrieving revision 1.30
diff -c -c -r1.30 win32.mak
*** src/interfaces/libpq/win32.mak	26 Jan 2005 19:24:02 -0000	1.30
--- src/interfaces/libpq/win32.mak	21 Feb 2005 21:18:52 -0000
***************
*** 41,47 ****
  !ENDIF
  
  
! ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" 
  
  CLEAN :
  	-@erase "$(INTDIR)\getaddrinfo.obj"
--- 41,47 ----
  !ENDIF
  
  
! ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
  
  CLEAN :
  	-@erase "$(INTDIR)\getaddrinfo.obj"
***************
*** 65,80 ****
  	-@erase "$(INTDIR)\pqsignal.obj"
  	-@erase "$(OUTDIR)\libpqdll.obj"
  	-@erase "$(OUTDIR)\win32.obj"
  	-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
! 	-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
  	-@erase "$(OUTDIR)\libpq.res"
  	-@erase "*.pch"
  	-@erase "$(OUTDIR)\libpq.pch"
  	-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
- 	-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
- 	-@erase "$(INTDIR)\wchar.obj"
- 	-@erase "$(INTDIR)\encnames.obj"
- 	-@erase "$(INTDIR)\pthread-win32.obj"
  	-@erase "$(INTDIR)\pg_config_paths.h"
  
  
--- 65,80 ----
  	-@erase "$(INTDIR)\pqsignal.obj"
  	-@erase "$(OUTDIR)\libpqdll.obj"
  	-@erase "$(OUTDIR)\win32.obj"
+ 	-@erase "$(INTDIR)\wchar.obj"
+ 	-@erase "$(INTDIR)\encnames.obj"
+ 	-@erase "$(INTDIR)\pthread-win32.obj"
  	-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
! 	-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
  	-@erase "$(OUTDIR)\libpq.res"
+ 	-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
  	-@erase "*.pch"
  	-@erase "$(OUTDIR)\libpq.pch"
  	-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
  	-@erase "$(INTDIR)\pg_config_paths.h"