diff options
| -rw-r--r-- | src/interfaces/ecpg/compatlib/.gitignore | 1 | ||||
| -rw-r--r-- | src/interfaces/ecpg/compatlib/Makefile | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/.gitignore | 1 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/Makefile | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/compatlib/.gitignore b/src/interfaces/ecpg/compatlib/.gitignore index 8b9aa950afe..d81829ce5ab 100644 --- a/src/interfaces/ecpg/compatlib/.gitignore +++ b/src/interfaces/ecpg/compatlib/.gitignore @@ -3,4 +3,5 @@ /exports.list /snprintf.c /strerror.c +/strlcpy.c /strnlen.c diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index e07a7fa8134..f6a7f2178e3 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -32,7 +32,7 @@ SHLIB_EXPORTS = exports.txt LIBS := $(filter-out -lpgport, $(LIBS)) OBJS= informix.o snprintf.o strerror.o \ - $(filter strnlen.o, $(LIBOBJS)) $(WIN32RES) + $(filter strlcpy.o strnlen.o, $(LIBOBJS)) $(WIN32RES) PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes @@ -49,7 +49,7 @@ submake-pgtypeslib: # Shared library stuff include $(top_srcdir)/src/Makefile.shlib -snprintf.c strerror.c strnlen.c: % : $(top_srcdir)/src/port/% +snprintf.c strerror.c strlcpy.c strnlen.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . install: all installdirs install-lib @@ -59,6 +59,6 @@ installdirs: installdirs-lib uninstall: uninstall-lib clean distclean: clean-lib - rm -f $(OBJS) snprintf.c strerror.c strnlen.c + rm -f $(OBJS) snprintf.c strerror.c strlcpy.c strnlen.c maintainer-clean: distclean maintainer-clean-lib diff --git a/src/interfaces/ecpg/pgtypeslib/.gitignore b/src/interfaces/ecpg/pgtypeslib/.gitignore index b3fae08d2f4..333b2817f89 100644 --- a/src/interfaces/ecpg/pgtypeslib/.gitignore +++ b/src/interfaces/ecpg/pgtypeslib/.gitignore @@ -5,5 +5,6 @@ /rint.c /snprintf.c /strerror.c +/strlcpy.c /string.c /strnlen.c diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index c4688e260ae..874c1a9fad4 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -31,7 +31,7 @@ SHLIB_EXPORTS = exports.txt OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \ pgstrcasecmp.o snprintf.o strerror.o \ - $(filter rint.o strnlen.o, $(LIBOBJS)) \ + $(filter rint.o strlcpy.o strnlen.o, $(LIBOBJS)) \ string.o \ $(WIN32RES) @@ -45,7 +45,7 @@ include $(top_srcdir)/src/Makefile.shlib # 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 rint.c snprintf.c strerror.c strnlen.c: % : $(top_srcdir)/src/port/% +pgstrcasecmp.c rint.c snprintf.c strerror.c strlcpy.c strnlen.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . string.c: % : $(top_srcdir)/src/common/% @@ -58,6 +58,6 @@ installdirs: installdirs-lib uninstall: uninstall-lib clean distclean: clean-lib - rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strerror.c strnlen.c string.c + rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strerror.c strlcpy.c strnlen.c string.c maintainer-clean: distclean maintainer-clean-lib |