diff options
| author | Heikki Linnakangas | 2011-09-01 11:02:40 +0000 |
|---|---|---|
| committer | Heikki Linnakangas | 2011-09-01 11:02:40 +0000 |
| commit | 65e899b2fb0703c9685c3b185fc1bfe206cde3b4 (patch) | |
| tree | 86ab788717845fc14ae1a8d9a46f54643895efd6 /src/interfaces | |
| parent | a88b6e4cfbff9802906dd400ef334ffa49e7f286 (diff) | |
Fix MinGW build, broken by my previous patch to add a setlocale() wrapper
on Windows. ecpglib doesn't link with libpgport, but picks and compiles
the .c files it needs individually. To cope with that, move the setlocale()
wrapper from chklocale.c to a separate setlocale.c file, and include that
in ecpglib.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index cdf84c3b09c..2b2ffb62073 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -26,7 +26,7 @@ LIBS := $(filter-out -lpgport, $(LIBS)) OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o memory.o \ connect.o misc.o path.o pgstrcasecmp.o \ - $(filter snprintf.o strlcpy.o, $(LIBOBJS)) + $(filter snprintf.o strlcpy.o win32setlocale.o, $(LIBOBJS)) # thread.c is needed only for non-WIN32 implementation of path.c ifneq ($(PORTNAME), win32) @@ -57,7 +57,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. -path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/% +path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h @@ -74,6 +74,6 @@ uninstall: uninstall-lib clean distclean: clean-lib rm -f $(OBJS) - rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c + rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c maintainer-clean: distclean maintainer-clean-lib |