From dd178e37f09cb4fba3cbf337c81e9128b40c9862 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 4 Mar 2002 17:43:32 +0000 Subject: [PATCH] Make port makefile slightly less crufty. --- src/backend/port/Makefile.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index 6f99a28d4a..248dcd1fd3 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -13,7 +13,7 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.31 2002/02/18 06:03:23 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.32 2002/03/04 17:43:32 tgl Exp $ # #------------------------------------------------------------------------- @@ -21,13 +21,14 @@ subdir = src/backend/port top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@ -OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @MEMCMP@ @STRCASECMP@ @TAS@ @ISINF@ -OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@ +# Note: invoking a macro from Makefile.global is better than substituting +# here; ideally this file should not need to be generated by configure +# at all. +OBJS = dynloader.o $(INET_ATON) $(STRERROR) @MISSING_RANDOM@ @SRANDOM@ +OBJS+= @GETHOSTNAME@ @GETRUSAGE@ $(MEMCMP) @STRCASECMP@ @TAS@ @ISINF@ +OBJS+= @STRTOL@ $(STRTOUL) $(SNPRINTF) ifdef STRDUP OBJS += $(top_builddir)/src/utils/strdup.o -$(top_builddir)/src/utils/strdup.o: - $(MAKE) -C $(top_builddir)/src/utils strdup.o endif ifeq ($(PORTNAME), qnx4) OBJS += getrusage.o qnx4/SUBSYS.o @@ -44,6 +45,9 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) +$(top_builddir)/src/utils/strdup.o: + $(MAKE) -C $(top_builddir)/src/utils strdup.o + qnx4/SUBSYS.o: qnx4.dir qnx4.dir: