mirror of
https://github.com/postgres/postgres.git
synced 2025-05-18 17:41:14 +03:00
ecpglib depends on last_path_separator from src/port/path.c, so we'd
better include that in the library build. This was fixed in 8.0 and later, backport to 7.4 to fix buildfarm failure.
This commit is contained in:
parent
bf84d6e3bb
commit
6ec28d8503
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 1994, Regents of the University of California
|
# Copyright (c) 1994, Regents of the University of California
|
||||||
#
|
#
|
||||||
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.10.2.2 2004/02/10 07:26:48 tgl Exp $
|
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.10.2.3 2005/07/16 20:39:24 tgl Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ SO_MINOR_VERSION= 1
|
|||||||
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS)
|
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS)
|
||||||
|
|
||||||
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
|
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
|
||||||
connect.o misc.o
|
connect.o misc.o path.o
|
||||||
|
|
||||||
SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
|
SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
|
||||||
$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(THREAD_LIBS)
|
$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(THREAD_LIBS)
|
||||||
@ -29,6 +29,14 @@ all: all-lib
|
|||||||
# Shared library stuff
|
# Shared library stuff
|
||||||
include $(top_srcdir)/src/Makefile.shlib
|
include $(top_srcdir)/src/Makefile.shlib
|
||||||
|
|
||||||
|
# We use some port modules verbatim, but since we need to
|
||||||
|
# compile with appropriate options to build a shared lib, we can't
|
||||||
|
# necessarily use the same object files as the backend uses. Instead,
|
||||||
|
# symlink the source files in here and build our own object file.
|
||||||
|
|
||||||
|
path.c: % : $(top_srcdir)/src/port/%
|
||||||
|
rm -f $@ && $(LN_S) $< .
|
||||||
|
|
||||||
install: all installdirs install-lib
|
install: all installdirs install-lib
|
||||||
|
|
||||||
installdirs:
|
installdirs:
|
||||||
@ -37,7 +45,7 @@ installdirs:
|
|||||||
uninstall: uninstall-lib
|
uninstall: uninstall-lib
|
||||||
|
|
||||||
clean distclean maintainer-clean: clean-lib
|
clean distclean maintainer-clean: clean-lib
|
||||||
rm -f $(OBJS)
|
rm -f $(OBJS) path.c
|
||||||
|
|
||||||
depend dep:
|
depend dep:
|
||||||
$(CC) -MM $(CFLAGS) *.c >depend
|
$(CC) -MM $(CFLAGS) *.c >depend
|
||||||
|
Loading…
x
Reference in New Issue
Block a user