diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-11-20 21:13:06 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-11-20 21:13:06 +0000 |
| commit | a34d76ef65b39bd18353a2c07ae8d4651cdb5403 (patch) | |
| tree | acce20c6038ff8627a4bf3fc2005f9c5de69f22b /src/interfaces/libpq/Makefile | |
| parent | 3e3f283e31b4e1da061970e048efe239a70b294d (diff) | |
| download | postgresql-a34d76ef65b39bd18353a2c07ae8d4651cdb5403.tar.gz | |
Fix up makefile dependencies for pg_config_paths.h.
Diffstat (limited to 'src/interfaces/libpq/Makefile')
| -rw-r--r-- | src/interfaces/libpq/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index c8a57f898d..56845318e8 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.121 2004/11/17 17:46:19 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.122 2004/11/20 21:13:06 tgl Exp $ # #------------------------------------------------------------------------- @@ -37,13 +37,15 @@ endif ifeq ($(PORTNAME), win32) OBJS += win32.o libpqrc.o -libpqrc.o : libpq.rc - windres -i libpq.rc -o libpqrc.o DLL_DEFFILE=libpqdll.def + +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 = yes +PTHREAD_H_WIN32 = pthread.h endif endif @@ -57,7 +59,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS)) endif -all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h def-files all-lib +all: $(PTHREAD_H_WIN32) def-files all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib @@ -118,12 +120,14 @@ $(srcdir)/blibpqdll.def: exports.txt ifneq ($(PTHREAD_H_WIN32), "") -pthread.h : % : $(top_srcdir)/src/interfaces/libpq/pthread.h.win +pthread.h: $(top_srcdir)/src/interfaces/libpq/pthread.h.win rm -f $@ && $(LN_S) $< . endif -$(top_srcdir)/src/port/pg_config_paths.h: - $(MAKE) -C $(top_srcdir)/src/port pg_config_paths.h +fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h + +$(top_builddir)/src/port/pg_config_paths.h: + $(MAKE) -C $(top_builddir)/src/port pg_config_paths.h install: all installdirs install-lib $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir) |