Commit 5651a166 authored by Bruce Momjian's avatar Bruce Momjian

Don't mention TIOGA in Makefile and move strdup.c rule into proper

'ifdef' in Makefile.
parent fb8e3f15
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.75 2001/11/20 00:27:13 tgl Exp $ # $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.76 2002/02/18 06:03:22 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -16,10 +16,6 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \ ...@@ -16,10 +16,6 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \
main nodes optimizer port postmaster regex rewrite \ main nodes optimizer port postmaster regex rewrite \
storage tcop utils storage tcop utils
ifdef TIOGA
DIRS += tioga
endif
OBJS := $(DIRS:%=%/SUBSYS.o) OBJS := $(DIRS:%=%/SUBSYS.o)
ifeq ($(PORTNAME), qnx4) ifeq ($(PORTNAME), qnx4)
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# be converted to Method 2. # be converted to Method 2.
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.30 2001/12/20 21:23:05 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.31 2002/02/18 06:03:23 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -26,6 +26,8 @@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @MEMCMP@ @STRCASECMP@ @TAS@ @ISINF@ ...@@ -26,6 +26,8 @@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @MEMCMP@ @STRCASECMP@ @TAS@ @ISINF@
OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@ OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@
ifdef STRDUP ifdef STRDUP
OBJS += $(top_builddir)/src/utils/strdup.o OBJS += $(top_builddir)/src/utils/strdup.o
$(top_builddir)/src/utils/strdup.o:
$(MAKE) -C $(top_builddir)/src/utils strdup.o
endif endif
ifeq ($(PORTNAME), qnx4) ifeq ($(PORTNAME), qnx4)
OBJS += getrusage.o qnx4/SUBSYS.o OBJS += getrusage.o qnx4/SUBSYS.o
...@@ -60,10 +62,6 @@ darwin.dir: ...@@ -60,10 +62,6 @@ darwin.dir:
tas.o: tas.s tas.o: tas.s
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
$(top_builddir)/src/utils/strdup.o:
$(MAKE) -C $(top_builddir)/src/utils strdup.o
distclean clean: distclean clean:
rm -f SUBSYS.o $(OBJS) rm -f SUBSYS.o $(OBJS)
$(MAKE) -C beos clean $(MAKE) -C beos clean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment