From: Magnus Hagander Date: Fri, 21 Dec 2007 09:03:31 +0000 (+0000) Subject: libpq needs pgsleep on win32 because of the changes to port/open.c. X-Git-Tag: REL9_0_0~4337 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f7f9f594bdae2bb09d1507aa0ad18ada2b47920;p=pg-rex%2Fsyncrep.git libpq needs pgsleep on win32 because of the changes to port/open.c. --- diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 15f5c69cf2..e6219d02ad 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.157 2007/11/30 16:21:19 mha Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.158 2007/12/21 09:03:31 mha Exp $ # #------------------------------------------------------------------------- @@ -41,7 +41,7 @@ override shlib = cyg$(NAME)$(DLSUFFIX) endif ifeq ($(PORTNAME), win32) -OBJS += win32.o libpqrc.o +OBJS += win32.o pgsleep.o libpqrc.o DLL_DEFFILE=libpqdll.def libpqrc.o: libpq.rc @@ -80,7 +80,7 @@ backend_src = $(top_srcdir)/src/backend # For port modules, this only happens if configure decides the module # is needed (see filter hack in OBJS, above). -crypt.c getaddrinfo.c inet_aton.c noblock.c open.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c win32error.c: % : $(top_srcdir)/src/port/% +crypt.c getaddrinfo.c inet_aton.c noblock.c open.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c win32error.c pgsleep.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . md5.c ip.c: % : $(backend_src)/libpq/% @@ -169,7 +169,7 @@ uninstall: uninstall-lib rm -f '$(DESTDIR)$(includedir)/libpq-fe.h' '$(DESTDIR)$(includedir_internal)/libpq-int.h' '$(DESTDIR)$(includedir_internal)/pqexpbuffer.h' '$(DESTDIR)$(datadir)/pg_service.conf.sample' clean distclean: clean-lib - rm -f $(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c open.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c md5.c ip.c encnames.c wchar.c win32error.c pthread.h exports.list + rm -f $(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c open.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c md5.c ip.c encnames.c wchar.c win32error.c pgsleep.c pthread.h exports.list # Might be left over from a Win32 client-only build rm -f pg_config_paths.h