Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita34d76e

Browse files
committed
Fix up makefile dependencies for pg_config_paths.h.
1 parent3e3f283 commita34d76e

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

‎src/Makefile.shlib

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.89 2004/11/19 21:27:42 tgl Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90 2004/11/20 21:13:04 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -257,9 +257,9 @@ endif # enable_shared
257257

258258
all-lib: all-static-lib all-shared-lib
259259

260-
all-static-lib:$(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.hlib$(NAME).a
260+
all-static-lib: lib$(NAME).a
261261

262-
all-shared-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h $(shlib)
262+
all-shared-lib: $(shlib)
263263

264264
ifndef LORDER
265265
MK_NO_LORDER := true

‎src/interfaces/ecpg/ecpglib/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.28 2004/10/12 04:48:35 neilc Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.29 2004/11/20 21:13:05 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -30,7 +30,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
3030
SHLIB_LINK = -L../pgtypeslib -lpgtypes$(libpq)\
3131
$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm,$(LIBS))$(PTHREAD_LIBS)
3232

33-
all:$(top_builddir)/src/port/pg_config_paths.hall-lib
33+
all: all-lib
3434

3535
# Shared library stuff
3636
include$(top_srcdir)/src/Makefile.shlib
@@ -46,8 +46,10 @@ path.c: % : $(top_srcdir)/src/port/%
4646
exec.c:% :$(top_srcdir)/src/port/%
4747
rm -f$@&&$(LN_S)$<.
4848

49-
$(top_srcdir)/src/port/pg_config_paths.h:
50-
$(MAKE) -C$(top_srcdir)/src/port pg_config_paths.h
49+
path.o: path.c$(top_builddir)/src/port/pg_config_paths.h
50+
51+
$(top_builddir)/src/port/pg_config_paths.h:
52+
$(MAKE) -C$(top_builddir)/src/port pg_config_paths.h
5153

5254
install: all installdirs install-lib
5355

‎src/interfaces/libpq/Makefile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.121 2004/11/17 17:46:19 tgl Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.122 2004/11/20 21:13:06 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -37,13 +37,15 @@ endif
3737

3838
ifeq ($(PORTNAME), win32)
3939
OBJS += win32.o libpqrc.o
40-
libpqrc.o : libpq.rc
41-
windres -i libpq.rc -o libpqrc.o
4240
DLL_DEFFILE=libpqdll.def
41+
42+
libpqrc.o: libpq.rc
43+
windres -i libpq.rc -o libpqrc.o
44+
4345
ifeq ($(enable_thread_safety), yes)
4446
# This doesn't work yet because configure test fails. 2004-06-19
4547
OBJS += pthread-win32.o
46-
PTHREAD_H_WIN32 =yes
48+
PTHREAD_H_WIN32 =pthread.h
4749
endif
4850
endif
4951

@@ -57,7 +59,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
5759
endif
5860

5961

60-
all:$(PTHREAD_H_WIN32)$(top_builddir)/src/port/pg_config_paths.hdef-files all-lib
62+
all:$(PTHREAD_H_WIN32) def-files all-lib
6163

6264
# Shared library stuff
6365
include$(top_srcdir)/src/Makefile.shlib
@@ -118,12 +120,14 @@ $(srcdir)/blibpqdll.def: exports.txt
118120

119121

120122
ifneq ($(PTHREAD_H_WIN32), "")
121-
pthread.h :%:$(top_srcdir)/src/interfaces/libpq/pthread.h.win
123+
pthread.h:$(top_srcdir)/src/interfaces/libpq/pthread.h.win
122124
rm -f$@&&$(LN_S)$<.
123125
endif
124126

125-
$(top_srcdir)/src/port/pg_config_paths.h:
126-
$(MAKE) -C$(top_srcdir)/src/port pg_config_paths.h
127+
fe-connect.o: fe-connect.c$(top_builddir)/src/port/pg_config_paths.h
128+
129+
$(top_builddir)/src/port/pg_config_paths.h:
130+
$(MAKE) -C$(top_builddir)/src/port pg_config_paths.h
127131

128132
install: all installdirs install-lib
129133
$(INSTALL_DATA)$(srcdir)/libpq-fe.h$(DESTDIR)$(includedir)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp