Make src/backend/port/*.c file location dependent only on configure.in.

diff --git a/contrib/pg_controldata/Makefile b/contrib/pg_controldata/Makefile
index 80ffad854c7e21b60723aafd1c8c47e9c01b3f1d..c0272ec41bb79136e908cbcef9729678d48c0df9 100644 (file)
--- a/contrib/pg_controldata/Makefile
+++ b/contrib/pg_controldata/Makefile
@@ -1,18 +1,19 @@
-# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.5 2001/09/06 10:49:29 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.6 2002/07/18 03:59:49 momjian Exp $
 
 subdir = contrib/pg_controldata
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 PROGRAM = pg_controldata
-OBJS   = pg_controldata.o pg_crc.o $(SNPRINTF)
+OBJS   = pg_controldata.o pg_crc.o $(notdir $(SNPRINTF))
 
 pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
        rm -f $@ && $(LN_S) $< .
 
-# this only gets done if configure finds system doesn't have snprintf()
-snprintf.c: $(top_srcdir)/src/backend/port/snprintf.c
+ifdef SNPRINTF
+$(basename $(notdir $(SNPRINTF))).c: $(basename $(SNPRINTF)).c
        rm -f $@ && $(LN_S) $< .
+endif
 
 EXTRA_CLEAN = pg_crc.c snprintf.c
 

diff --git a/contrib/pg_resetxlog/Makefile b/contrib/pg_resetxlog/Makefile
index eee05b1eda578c308427e27a3cbadabaa5466467..652c1a2c95111859eabe0a6d9f7327830b9b1ff6 100644 (file)
--- a/contrib/pg_resetxlog/Makefile
+++ b/contrib/pg_resetxlog/Makefile
@@ -1,18 +1,19 @@
-# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.3 2001/09/06 10:49:30 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.4 2002/07/18 03:59:49 momjian Exp $
 
 subdir = contrib/pg_resetxlog
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 PROGRAM = pg_resetxlog
-OBJS   = pg_resetxlog.o pg_crc.o $(SNPRINTF)
+OBJS   = pg_resetxlog.o pg_crc.o $(notdir $(SNPRINTF))
 
 pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
        rm -f $@ && $(LN_S) $< .
 
-# this only gets done if configure finds system doesn't have snprintf()
-snprintf.c: $(top_srcdir)/src/backend/port/snprintf.c
+ifdef SNPRINTF
+$(basename $(notdir $(SNPRINTF))).c: $(basename $(SNPRINTF)).c
        rm -f $@ && $(LN_S) $< .
+endif
 
 EXTRA_CLEAN = pg_crc.c snprintf.c
 

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index e0adb54b93a5365886aa427cd620bdb0fb0f67e1..5700a95a773bad870497f60bf47249011ce0c25d 100644 (file)
--- 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.62 2002/06/14 04:23:17 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.63 2002/07/18 03:59:49 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,6 +12,7 @@ subdir = src/interfaces/libpq
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
+
 # shared library parameters
 NAME= pq
 SO_MAJOR_VERSION= 2
@@ -21,12 +22,13 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconf
 
 OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
       pqexpbuffer.o dllist.o md5.o pqsignal.o fe-secure.o \
-      $(INET_ATON) $(SNPRINTF) $(STRERROR)
+      $(notdir $(INET_ATON)) $(notdir $(SNPRINTF)) $(notdir $(STRERROR))
 
 ifdef MULTIBYTE
 OBJS+= wchar.o encnames.o
 endif
 
+
 # Add libraries that libpq depends (or might depend) on into the
 # shared library link.  (The order in which you list them here doesn't
 # matter.)
@@ -37,32 +39,35 @@ all: all-lib
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
-
-
-# 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.
-
 backend_src = $(top_srcdir)/src/backend
 
+
 dllist.c: $(backend_src)/lib/dllist.c
        rm -f $@ && $(LN_S) $< .
 
 md5.c: $(backend_src)/libpq/md5.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()
-inet_aton.c: $(backend_src)/port/inet_aton.c
+
+ifdef INET_ATON
+$(basename $(notdir $(INET_ATON))).c: $(basename $(INET_ATON)).c
        rm -f $@ && $(LN_S) $< .
+endif
 
-# this only gets done if configure finds system doesn't have snprintf()
-snprintf.c: $(backend_src)/port/snprintf.c
+ifdef SNPRINTF
+$(basename $(notdir $(SNPRINTF))).c: $(basename $(SNPRINTF)).c
        rm -f $@ && $(LN_S) $< .
+endif
 
-# this only gets done if configure finds system doesn't have strerror()
-strerror.c: $(backend_src)/port/strerror.c
+ifdef STRERROR
+$(basename $(notdir $(STRERROR))).c: $(basename $(STRERROR)).c
        rm -f $@ && $(LN_S) $< .
+endif
 
 ifdef MULTIBYTE
 wchar.c : % : $(backend_src)/utils/mb/%