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

bmomjian · bmomjian · commit 5651a1665f4b · 2002-02-18T06:03:23.000Z
'ifdef' in Makefile.
diff --git a/src/backend/Makefile b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # 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 \
 	main nodes optimizer port postmaster regex rewrite \
 	storage tcop utils
 
-ifdef TIOGA
-DIRS += tioga
-endif
-
 OBJS := $(DIRS:%=%/SUBSYS.o)
 
 ifeq ($(PORTNAME), qnx4)
diff --git 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.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@
 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
@@ -60,10 +62,6 @@ darwin.dir:
 tas.o: tas.s
 	$(CC) $(CFLAGS) -c $<
 
-$(top_builddir)/src/utils/strdup.o:
-	$(MAKE) -C $(top_builddir)/src/utils strdup.o
-
-
 distclean clean:
 	rm -f SUBSYS.o $(OBJS)
 	$(MAKE) -C beos clean

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)`