Commit5651a16

committed

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

'ifdef' in Makefile.

1 parentfb8e3f1 commit5651a16Copy full SHA for 5651a16

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.75 2001/11/20 00:27:13 tgl Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.76 2002/02/18 06:03:22 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -16,10 +16,6 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \`
`16`	`16`	`main nodes optimizer port postmaster regex rewrite \`
`17`	`17`	`storage tcop utils`
`18`	`18`
`19`		`-ifdef TIOGA`
`20`		`-DIRS += tioga`
`21`		`-endif`
`22`		`-`
`23`	`19`	`OBJS := $(DIRS:%=%/SUBSYS.o)`
`24`	`20`
`25`	`21`	`ifeq ($(PORTNAME), qnx4)`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# be converted to Method 2.`
`14`	`14`	`#`
`15`	`15`	`# IDENTIFICATION`
`16`		`-# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.30 2001/12/20 21:23:05 momjian Exp $`
	`16`	`+# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.31 2002/02/18 06:03:23 momjian Exp $`
`17`	`17`	`#`
`18`	`18`	`#-------------------------------------------------------------------------`
`19`	`19`
`@@ -26,6 +26,8 @@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @MEMCMP@ @STRCASECMP@ @TAS@ @ISINF@`
`26`	`26`	`OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@`
`27`	`27`	`ifdef STRDUP`
`28`	`28`	`OBJS += $(top_builddir)/src/utils/strdup.o`
	`29`	`+$(top_builddir)/src/utils/strdup.o:`
	`30`	`+$(MAKE) -C $(top_builddir)/src/utils strdup.o`
`29`	`31`	`endif`
`30`	`32`	`ifeq ($(PORTNAME), qnx4)`
`31`	`33`	`OBJS += getrusage.o qnx4/SUBSYS.o`
`@@ -60,10 +62,6 @@ darwin.dir:`
`60`	`62`	`tas.o: tas.s`
`61`	`63`	`$(CC) $(CFLAGS) -c $<`
`62`	`64`
`63`		`-$(top_builddir)/src/utils/strdup.o:`
`64`		`-$(MAKE) -C $(top_builddir)/src/utils strdup.o`
`65`		`-`
`66`		`-`
`67`	`65`	`distclean clean:`
`68`	`66`	`rm -f SUBSYS.o $(OBJS)`
`69`	`67`	`$(MAKE) -C beos clean`

Comments

(0)