diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 16a5ff5ad1453f7b235b856aa5f0e7ebb0ab861b..a9e19de3d997e4eae13b6e7fea851bf67ecd6159 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.74 2003/03/29 11:31:51 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.75 2003/04/14 21:15:13 tgl Exp $ # #------------------------------------------------------------------------- @@ -21,9 +21,9 @@ SO_MINOR_VERSION= 1 override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ - pqexpbuffer.o dllist.o pqsignal.o fe-secure.o wchar.o encnames.o ip.o \ - md5.o \ - $(filter getaddrinfo.o inet_aton.o snprintf.o strerror.o, $(LIBOBJS)) + pqexpbuffer.o pqsignal.o fe-secure.o \ + dllist.o md5.o ip.o wchar.o encnames.o \ + $(filter getaddrinfo.o inet_aton.o snprintf.o strerror.o path.o, $(LIBOBJS)) # Add libraries that libpq depends (or might depend) on into the @@ -39,6 +39,16 @@ include $(top_srcdir)/src/Makefile.shlib backend_src = $(top_srcdir)/src/backend +# We use several backend 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. +# For port modules, this only happens if configure decides the module +# is needed (see filter hack in OBJS, above). + +getaddrinfo.c inet_aton.c snprintf.c strerror.c path.c: %.c : $(top_srcdir)/src/port/%.c + rm -f $@ && $(LN_S) $< . + dllist.c: $(backend_src)/lib/dllist.c rm -f $@ && $(LN_S) $< . @@ -48,15 +58,6 @@ md5.c: $(backend_src)/libpq/md5.c ip.c: $(backend_src)/libpq/ip.c rm -f $@ && $(LN_S) $< . -# We use several backend 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. -# this only gets done if configure finds system doesn't have inet_aton() - -getaddrinfo.c inet_aton.c snprintf.c strerror.c: %.c : $(top_srcdir)/src/port/%.c - rm -f $@ && $(LN_S) $< . - encnames.c wchar.c : % : $(backend_src)/utils/mb/% rm -f $@ && $(LN_S) $< . @@ -74,5 +75,5 @@ uninstall: uninstall-lib rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(includedir_internal)/pqexpbuffer.h clean distclean maintainer-clean: clean-lib + rm -f $(OBJS) getaddrinfo.c inet_aton.c snprintf.c strerror.c path.c rm -f $(OBJS) dllist.c md5.c ip.c wchar.c encnames.c - rm -f $(OBJS) getaddrinfo.c inet_aton.c snprintf.c strerror.c