aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBryan Henderson <bryanh@giraffe.netgate.net>1996-11-04 06:32:59 +0000
committerBryan Henderson <bryanh@giraffe.netgate.net>1996-11-04 06:32:59 +0000
commit089dfb61f016c98b10aa77936a713b65c908b23f (patch)
treed2d11a5049457a8ad66754775074ab1833882198 /src
parent5061c23ac20ada3f2cfbaf0d5a5515c810bc8a6a (diff)
downloadpostgresql-089dfb61f016c98b10aa77936a713b65c908b23f.tar.gz
postgresql-089dfb61f016c98b10aa77936a713b65c908b23f.zip
Add ability to deal with the fmgr.h dependency.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/Makefile20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 4a26091ea1a..7d35ed0ebf2 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -7,14 +7,15 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.11 1996/11/04 04:00:53 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.12 1996/11/04 06:32:59 bryanh Exp $
#
#-------------------------------------------------------------------------
SRCDIR= ..
include ../Makefile.global
-INCLUDE_OPT= -I../include -I.
+# We need the backend directory here for its fmgr.h
+INCLUDE_OPT= -I../include -I../backend
CFLAGS+= $(INCLUDE_OPT) -DPOSTPORT='"$(POSTPORT)"'
@@ -24,7 +25,7 @@ endif
# dllist.c is found in backend/lib
VPATH:= $(VPATH):../backend/lib
-
+
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \
../backend/lib/dllist.o pqsignal.o
ifeq ($(PORTNAME), next)
@@ -48,15 +49,20 @@ else
endif
$(RANLIB) libpq.a
-libpq.so.1: $(OBJS)
- $(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1
+fe-lobj.o:: ../backend/fmgr.h
-# If dllist.o is out of date, we will not cause it to get remade. We
-# only make it if it doesn't exist.
+# The following rules cause dependencies in the backend directory to
+# get made if they don't exist, but don't cause them to get remade if they
+# are out of date.
+../backend/fmgr.h:
+ $(MAKE) -C ../backend fmgr.h
../backend/lib/dllist.o:
$(MAKE) -C ../backend/lib dllist.o
+libpq.so.1: $(OBJS)
+ $(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1
+
postgres.h: ../include/postgres.h
# Note: ../backend/include/postgres.h needs to be named something different
# to avoid confusion with this thing we're building now.