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

Commit089dfb6

Browse files
author
Bryan Henderson
committed
Add ability to deal with the fmgr.h dependency.
1 parent5061c23 commit089dfb6

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

‎src/interfaces/libpq/Makefile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.11 1996/11/0404:00:53 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.12 1996/11/0406:32:59 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
1515
include ../Makefile.global
1616

17-
INCLUDE_OPT= -I../include -I.
17+
# We need the backend directory here for its fmgr.h
18+
INCLUDE_OPT= -I../include -I../backend
1819

1920
CFLAGS+=$(INCLUDE_OPT) -DPOSTPORT='"$(POSTPORT)"'
2021

@@ -24,7 +25,7 @@ endif
2425

2526
# dllist.c is found in backend/lib
2627
VPATH:=$(VPATH):../backend/lib
27-
28+
2829
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o\
2930
../backend/lib/dllist.o pqsignal.o
3031
ifeq ($(PORTNAME), next)
@@ -48,15 +49,20 @@ else
4849
endif
4950
$(RANLIB) libpq.a
5051

51-
libpq.so.1:$(OBJS)
52-
$(CC)$(LDFLAGS) -shared$(OBJS) -o libpq.so.1
52+
fe-lobj.o:: ../backend/fmgr.h
5353

54-
# If dllist.o is out of date, we will not cause it to get remade. We
55-
# only make it if it doesn't exist.
54+
# The following rules cause dependencies in the backend directory to
55+
# get made if they don't exist, but don't cause them to get remade if they
56+
# are out of date.
57+
../backend/fmgr.h:
58+
$(MAKE) -C ../backend fmgr.h
5659

5760
../backend/lib/dllist.o:
5861
$(MAKE) -C ../backend/lib dllist.o
5962

63+
libpq.so.1:$(OBJS)
64+
$(CC)$(LDFLAGS) -shared$(OBJS) -o libpq.so.1
65+
6066
postgres.h: ../include/postgres.h
6167
# Note: ../backend/include/postgres.h needs to be named something different
6268
# to avoid confusion with this thing we're building now.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp