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

Commit29e7dc4

Browse files
committed
Add some pg_config_path.h dependencies for places that include
pg_config_paths.h outside of /src/port.
1 parentd10a406 commit29e7dc4

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
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.79 2004/10/0804:22:59 tgl Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.80 2004/10/12 01:04:09 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -245,9 +245,9 @@ endif # enable_shared
245245

246246
all-lib: all-static-lib all-shared-lib
247247

248-
all-static-lib: lib$(NAME).a
248+
all-static-lib:$(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.hlib$(NAME).a
249249

250-
all-shared-lib: $(shlib)
250+
all-shared-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h $(shlib)
251251

252252
ifneq ($(PORTNAME), cygwin)
253253
ifneq ($(PORTNAME), win32)

‎src/interfaces/ecpg/ecpglib/Makefile‎

Lines changed: 5 additions & 2 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.26 2004/10/04 20:36:11 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.27 2004/10/12 01:04:10 momjian 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: all-lib
33+
all:$(top_srcdir)/src/port/pg_config_paths.hall-lib
3434

3535
# Shared library stuff
3636
include$(top_srcdir)/src/Makefile.shlib
@@ -46,6 +46,9 @@ 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
51+
4952
install: all installdirs install-lib
5053

5154
installdirs:

‎src/interfaces/libpq/Makefile‎

Lines changed: 9 additions & 6 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/libpq/Makefile,v 1.115 2004/10/06 16:42:01 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.116 2004/10/12 01:04:11 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -31,13 +31,13 @@ OBJS=fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
3131
$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o,$(LIBOBJS))
3232

3333
ifeq ($(PORTNAME), win32)
34-
OBJS+=win32.o libpqrc.o
35-
libpqrc.o: libpq.rc
34+
OBJS +=win32.o libpqrc.o
35+
libpqrc.o: libpq.rc
3636
windres -i libpq.rc -o libpqrc.o
3737
ifeq ($(enable_thread_safety), yes)
3838
# This doesn't work yet because configure test fails. 2004-06-19
39-
OBJS+=pthread-win32.o
40-
PTHREAD_H_WIN32=yes
39+
OBJS +=pthread-win32.o
40+
PTHREAD_H_WIN32 =yes
4141
endif
4242
endif
4343

@@ -51,7 +51,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
5151
endif
5252

5353

54-
all:$(PTHREAD_H_WIN32) all-lib
54+
all:$(PTHREAD_H_WIN32)$(top_srcdir)/src/port/pg_config_paths.hall-lib
5555

5656
# Shared library stuff
5757
include$(top_srcdir)/src/Makefile.shlib
@@ -83,6 +83,9 @@ pthread.h : % : $(top_srcdir)/src/interfaces/libpq/pthread.h.win
8383
rm -f$@&&$(LN_S)$<.
8484
endif
8585

86+
$(top_srcdir)/src/port/pg_config_paths.h:
87+
$(MAKE) -C$(top_srcdir)/src/port pg_config_paths.h
88+
8689
install: all installdirs install-lib
8790
$(INSTALL_DATA)$(srcdir)/libpq-fe.h$(DESTDIR)$(includedir)
8891
$(INSTALL_DATA)$(srcdir)/libpq-int.h$(DESTDIR)$(includedir_internal)

0 commit comments

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