Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c3fa600

Browse files
committed
Need to factor out strdup.o for separate treatment since it's in a
different directory. This makes dependency tracking work and copes with compilers that don't suport -c and -o together.
1 parent 530dc73 commit c3fa600

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/backend/port/Makefile.in

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# be converted to Method 2.
1414
#
1515
# IDENTIFICATION
16-
# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.28 2000/12/11 00:49:54 tgl Exp $
16+
# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.29 2001/05/08 19:38:57 petere Exp $
1717
#
1818
#-------------------------------------------------------------------------
1919

@@ -22,8 +22,11 @@ top_builddir = ../../..
2222
include $(top_builddir)/src/Makefile.global
2323

2424
OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@
25-
OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@
25+
OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @TAS@ @ISINF@
2626
OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@
27+
ifdef STRDUP
28+
OBJS += $(top_builddir)/src/utils/strdup.o
29+
endif
2730
ifeq ($(PORTNAME), qnx4)
2831
OBJS += getrusage.o qnx4/SUBSYS.o
2932
endif
@@ -57,6 +60,10 @@ darwin.dir:
5760
tas.o: tas.s
5861
$(CC) $(CFLAGS) -c $<
5962

63+
$(top_builddir)/src/utils/strdup.o:
64+
$(MAKE) -C $(top_builddir)/src/utils strdup.o
65+
66+
6067
distclean clean:
6168
rm -f SUBSYS.o $(OBJS)
6269
$(MAKE) -C beos clean

0 commit comments

Comments
 (0)