Skip to content

Commit 49c3cf5

Browse files
committed
path.c needs to be included in libpq; per Joe Conway.
1 parent 3f4f235 commit 49c3cf5

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

src/interfaces/libpq/Makefile

Lines changed: 15 additions & 14 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-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.74 2003/03/29 11:31:51 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.75 2003/04/14 21:15:13 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -21,9 +21,9 @@ SO_MINOR_VERSION= 1
2121
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
2222

2323
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
24-
pqexpbuffer.o dllist.o pqsignal.o fe-secure.o wchar.o encnames.o ip.o \
25-
md5.o \
26-
$(filter getaddrinfo.o inet_aton.o snprintf.o strerror.o, $(LIBOBJS))
24+
pqexpbuffer.o pqsignal.o fe-secure.o \
25+
dllist.o md5.o ip.o wchar.o encnames.o \
26+
$(filter getaddrinfo.o inet_aton.o snprintf.o strerror.o path.o, $(LIBOBJS))
2727

2828

2929
# Add libraries that libpq depends (or might depend) on into the
@@ -39,6 +39,16 @@ include $(top_srcdir)/src/Makefile.shlib
3939
backend_src = $(top_srcdir)/src/backend
4040

4141

42+
# We use several backend modules verbatim, but since we need to
43+
# compile with appropriate options to build a shared lib, we can't
44+
# necessarily use the same object files as the backend uses. Instead,
45+
# symlink the source files in here and build our own object file.
46+
# For port modules, this only happens if configure decides the module
47+
# is needed (see filter hack in OBJS, above).
48+
49+
getaddrinfo.c inet_aton.c snprintf.c strerror.c path.c: %.c : $(top_srcdir)/src/port/%.c
50+
rm -f $@ && $(LN_S) $< .
51+
4252
dllist.c: $(backend_src)/lib/dllist.c
4353
rm -f $@ && $(LN_S) $< .
4454

@@ -48,15 +58,6 @@ md5.c: $(backend_src)/libpq/md5.c
4858
ip.c: $(backend_src)/libpq/ip.c
4959
rm -f $@ && $(LN_S) $< .
5060

51-
# We use several backend modules verbatim, but since we need to
52-
# compile with appropriate options to build a shared lib, we can't
53-
# necessarily use the same object files as the backend uses. Instead,
54-
# symlink the source files in here and build our own object file.
55-
# this only gets done if configure finds system doesn't have inet_aton()
56-
57-
getaddrinfo.c inet_aton.c snprintf.c strerror.c: %.c : $(top_srcdir)/src/port/%.c
58-
rm -f $@ && $(LN_S) $< .
59-
6061
encnames.c wchar.c : % : $(backend_src)/utils/mb/%
6162
rm -f $@ && $(LN_S) $< .
6263

@@ -74,5 +75,5 @@ uninstall: uninstall-lib
7475
rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(includedir_internal)/pqexpbuffer.h
7576

7677
clean distclean maintainer-clean: clean-lib
78+
rm -f $(OBJS) getaddrinfo.c inet_aton.c snprintf.c strerror.c path.c
7779
rm -f $(OBJS) dllist.c md5.c ip.c wchar.c encnames.c
78-
rm -f $(OBJS) getaddrinfo.c inet_aton.c snprintf.c strerror.c

0 commit comments

Comments
 (0)