Commit 974c5a87 authored by Tom Lane's avatar Tom Lane

ecpg/pgtypeslib seems to need snprintf.c pulled in, too.

parent 0d2aad85
...@@ -4,7 +4,7 @@ ...@@ -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/pgtypeslib/Makefile,v 1.26 2005/03/14 17:27:50 momjian Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.27 2005/12/06 05:26:21 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -17,28 +17,30 @@ SO_MAJOR_VERSION= 2 ...@@ -17,28 +17,30 @@ SO_MAJOR_VERSION= 2
SO_MINOR_VERSION= 1 SO_MINOR_VERSION= 1
DLTYPE= library DLTYPE= library
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include \ override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \
-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS) \ -I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS)
$(PTHREAD_CFLAGS) -DFRONTEND override CFLAGS += $(PTHREAD_CFLAGS)
# Need to recomple any libpgport object files # Need to recompile any libpgport object files
LIBS := $(patsubst -lpgport,, $(LIBS)) LIBS := $(filter-out -lpgport, $(LIBS))
SHLIB_LINK += -lm SHLIB_LINK += -lm
OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \ OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
pgstrcasecmp.o \ pgstrcasecmp.o \
$(filter rint.o, $(LIBOBJS)) $(filter rint.o snprintf.o, $(LIBOBJS))
all: all-lib all: all-lib
# Shared library stuff # Shared library stuff
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
rint.c: %.c : $(top_srcdir)/src/port/%.c # We use some port modules verbatim, but since we need to
rm -f $@ && $(LN_S) $< . # 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.
pgstrcasecmp.c: %.c : $(top_srcdir)/src/port/%.c pgstrcasecmp.c rint.c snprintf.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
install: all installdirs install-lib install: all installdirs install-lib
...@@ -49,7 +51,7 @@ installdirs: ...@@ -49,7 +51,7 @@ installdirs:
uninstall: uninstall-lib uninstall: uninstall-lib
clean distclean maintainer-clean: clean-lib clean distclean maintainer-clean: clean-lib
rm -f $(OBJS) rint.c pgstrcasecmp.c rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c
depend dep: depend dep:
$(CC) -MM $(CFLAGS) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment