Fix relative path references so that make knowns which dependencies refer

to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.

GNUmakefile.in

 #
 # PostgreSQL top level makefile
 #
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.10 2000/08/20 15:55:15 petere Exp $
+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.11 2000/08/31 16:08:58 petere Exp $
 #
 
 subdir =
 top_builddir = .
-include src/Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all:
 	$(MAKE) -C doc all

contrib/findoidjoins/Makefile

 #
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.9 2000/08/31 16:08:59 petere Exp $
 #
 
 subdir = contrib/findoidjoins
 top_builddir = ../..
 include ../../src/Makefile.global
 
-CFLAGS	+= -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
-LIBS	+= $(LIBPGEASY)
+CFLAGS	+= -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
+LIBS	+= $(libpgeasy)
 
 all: findoidjoins
 

contrib/mSQL-interface/Makefile

 #
-# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.4 2000/07/09 13:13:17 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.5 2000/08/31 16:09:00 petere Exp $
 #
 
 subdir = contrib/mSQL-interface
 top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 NAME	:= mpgsql
 SO_MAJOR_VERSION := 0
 SO_MINOR_VERSION := 0
 OBJS	:= mpgsql.o
 
-CFLAGS	+= -I$(LIBPQDIR)
+CFLAGS	+= -I$(libpq_srcdir)
 
 include $(top_srcdir)/src/Makefile.shlib
 

contrib/odbc/Makefile

 # ODBC extensions
 # Thomas Lockhart 2000-04-03
 
-SRCDIR= ../../src
-
-include $(SRCDIR)/Makefile.global
+subdir = contrib/odbc
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
 
 ifndef PGLIB
   PGLIB= .

contrib/pg_dumplo/Makefile

 #
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.6 2000/08/31 16:09:05 petere Exp $
 #
 
 subdir = contrib/pg_dumplo
@@ -7,12 +7,12 @@ top_builddir = ../..
 include ../../src/Makefile.global
 
 OBJS	= main.o lo_export.o lo_import.o utils.o
-CFLAGS += -I$(LIBPQDIR)
+CFLAGS += -I$(libpq_srcdir)
 
 all: pg_dumplo
 
-pg_dumplo: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ) 
+pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq)
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_dumplo$(X)	$(bindir)

contrib/pgbench/Makefile

 #
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.6 2000/08/31 16:09:09 petere Exp $
 #
 
 subdir = contrib/pgbench
 top_builddir = ../..
 include ../../src/Makefile.global
 
-CFLAGS	+= -I$(LIBPQDIR)
-LIBS	+= $(LIBPQ)
+CFLAGS	+= -I$(libpq_srcdir)
+LIBS	+= $(libpq)
 
 all: pgbench
 

contrib/vacuumlo/Makefile

 #
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.6 2000/07/09 13:13:55 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.7 2000/08/31 16:09:12 petere Exp $
 #
 
 subdir = contrib/vacuumlo
 top_builddir = ../..
 include ../../src/Makefile.global
 
-CPPFLAGS += -I$(LIBPQDIR)
-LIBS += $(LIBPQ)
+CPPFLAGS += -I$(libpq_srcdir)
+LIBS += $(libpq)
 
 all: vacuumlo
 

doc/src/Makefile

 # Postgres documentation makefile
-# Thomas Lockhart
+# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.11 2000/08/31 16:09:16 petere Exp $
 
-# Not yet generated from configure, so use relative path names for now...
-PGDOCS= ..
-SRCDIR= ../../src
+subdir = doc/src
+top_builddir = ../..
+-include $(top_builddir)/src/Makefile.global
 
 TAR= tar
 ZIP= gzip
 TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
 
-# Pick up Makefile.global from the source area
-# This is the only resource from the code source area and is optional
-
-ifneq ($(wildcard $(SRCDIR)/Makefile.global), )
-include $(SRCDIR)/Makefile.global
-endif
-
 SRC= admin postgres programmer tutorial user
 
 TARGETS= $(SRC:%=%.tar.gz)
@@ -80,5 +73,4 @@ man.tar:
 # Compressed file
 
 %.gz:	%
-	($(ZIP) -f $<)
-
+	$(GZIP) -f $<

doc/src/sgml/Makefile

@@ -8,12 +8,17 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.18 2000/08/26 13:08:14 petere Exp $
+#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.19 2000/08/31 16:09:20 petere Exp $
 #
 #----------------------------------------------------------------------------
 
-PGDOCS= ../..
-SRCDIR= ../../../src
+# Pick up Makefile.global from the source area
+# This is the only resource from the code source area and is optional.
+# Actually, we want this to get Makefile.custom - thomas 1998-03-01
+subdir = doc/src/sgml
+top_builddir = ../../..
+-include $(top_builddir)/src/Makefile.global
+
 
 # This is where the default stylesheets appear on my linux system.
 # Probably no need to change this; rather, put definitions
@@ -46,14 +51,6 @@ D2MSCRIPT= $(D2MDIR)/docbook2man-spec.pl
 
 TAR= tar
 
-# Pick up Makefile.global from the source area
-# This is the only resource from the code source area and is optional.
-# Actually, we want this to get Makefile.custom - thomas 1998-03-01
-
-ifneq ($(wildcard $(SRCDIR)/Makefile.global),)
-  include $(SRCDIR)/Makefile.global
-endif
-
 # Hmm, made this optional but jade _really_ doesn't like them missing
 # - thomas 1998-03-01
 ifneq ($(HDSL), )

src/Makefile.global.in

-#----------------------------------------------------------------------------
-#
-# Makefile.global--
-#    global configuration for the Makefiles
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.91 2000/08/28 11:53:14 petere Exp $
-#
-# NOTES
-#    Essentially all Postgres make files include this file and use the
-#    variables it sets.
-#
-#    To override the default setting, create a Makefile.custom in this
-#    directory and put your defines there. (Makefile.custom is included
-#    near the end of this file).  Sometimes, a variable gets set in
-#    Makefile.global after Makefile.custom has been included, so you can't
-#    simply set that variable in Makefile.custom.  In those cases, there is
-#    often another variable (like CUSTOM_COPT) that you can set in
-#    Makefile.custom that influences the later setting of the true variable
-#    of interest (like CFLAGS) by Makefile.global.
-#
-#
-#    If you change any of these defines you probably have to
-#       make clean; make
-#    since no dependencies are created for these. (of course you can
-#    be crafty and check what files really depend on them and just remake
-#    those).
-#
-#    Before including this file, you must set the SRCDIR variable to the
-#    path of the top of the Postgres source tree (the directory that
-#    contains this file).
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.92 2000/08/31 16:09:22 petere Exp $
+
+#------------------------------------------------------------------------------
+# All PostgreSQL makefiles include this file and use the variables it sets,
+# which in turn are put here by the configure script. There is no need for
+# users to edit this file -- if it turns out to be necessary then that's a
+# bug.
 #
-#-------------------------------------------------------------------------
+# A makefile that includes this file needs to set the variable `subdir' to
+# the relative path from the top to itself and `top_builddir' to the relative
+# path from itself to the top before including this file. (The "top" is the
+# parent directory of the directory this file is in.)
+#------------------------------------------------------------------------------
 
 # PostgreSQL version number
 VERSION = @VERSION@
 
-ifndef top_builddir
-top_builddir = $(SRCDIR)/..
-endif
-
-ifndef SRCDIR
-SRCDIR = $(top_builddir)/src
-endif
-
 # This should be changed once we have separate build dirs.
 top_srcdir = $(top_builddir)
 
@@ -73,13 +42,14 @@ BSD_SHLIB= true
 # systems now.  May be applicable to other systems to?
 ELF_SYSTEM= @ELF_SYS@
 
-LIBPQDIR= $(SRCDIR)/interfaces/libpq
-LIBPGEASYDIR= $(SRCDIR)/interfaces/libpgeasy
-LIBPGTCLDIR= $(SRCDIR)/interfaces/libpgtcl
+libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
+libpq_builddir = $(top_builddir)/src/interfaces/libpq
+libpq = -L$(libpq_builddir) -lpq
+
+libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
+libpgeasy_builddir = $(top_builddir/src/interfaces/libpgeasy
+libpgeasy = -L$(libpgeasy_builddir) -lpgeasy
 
-LIBPQ= -L$(LIBPQDIR) -lpq
-LIBPGTCL= -L$(LIBPGTCLDIR) -lpgtcl
-LIBPGEASY= -L$(LIBPGEASYDIR) -lpgeasy
 
 # installation directories
 
@@ -99,16 +69,6 @@ docdir = @docdir@
 
 odbcinst_ini_dir = @odbcinst_ini_dir@
 
-# old variable names for installation directories
-
-POSTGRESDIR= $(prefix)
-BINDIR= $(bindir)
-LIBDIR= $(libdir)
-TEMPLATEDIR= $(libdir)
-POSTMANDIR= $(mandir)
-POSTDOCDIR= $(docdir)
-HEADERDIR= $(includedir)
-
 
 ##############################################################################
 #
@@ -117,10 +77,6 @@ HEADERDIR= $(includedir)
 # To disable a feature, comment out the entire definition
 # (that is, prepend '#', don't set it to "0" or "no").
 
-# Comment out ENFORCE_ALIGNMENT if you do NOT want unaligned access to
-# multi-byte types to generate a bus error.
-ENFORCE_ALIGNMENT= true
-
 # Comment out PROFILE to generate a profile version of the binaries
 #PROFILE= -p -non_shared
 
@@ -156,7 +112,6 @@ MULTIBYTE=@MULTIBYTE@
 #
 # Installation.
 #
-# For many ports, INSTALL is overridden below.
 INSTALL= @INSTALL@
 
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,7 +135,7 @@ FLEX = @FLEX@
 FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS)
 AROPT= @AROPT@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = -I$(SRCDIR)/include $(CPPFLAGS) @CFLAGS@
+CFLAGS = -I$(top_srcdir)/src/include $(CPPFLAGS) @CFLAGS@
 CFLAGS_SL= @SHARED_LIB@
 LIBS= @LIBS@
 LDFLAGS= @LDFLAGS@ $(LIBS)
@@ -210,7 +165,7 @@ CPU= @CPU@
 HAVE_POSIX_SIGNALS= @HAVE_POSIX_SIGNALS@
 HPUXMATHLIB= @HPUXMATHLIB@
 
-include $(SRCDIR)/Makefile.port
+include $(top_builddir)/src/Makefile.port
 
 ##############################################################################
 #
@@ -219,9 +174,7 @@ include $(SRCDIR)/Makefile.port
 # This includes your local customizations if Makefile.custom exists
 # in the source directory.  This file doesn't exist in the original
 # distribution so that it doesn't get overwritten when you upgrade.
-ifneq ($(wildcard $(SRCDIR)/Makefile.custom), )
-include $(SRCDIR)/Makefile.custom
-endif
+-include $(top_srcdir)/src/Makefile.custom
 
 # This goes here so that customization in Makefile.custom is effective
 ##############################################################################

src/backend/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.63 2000/07/19 16:29:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.64 2000/08/31 16:09:23 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/backend
 top_builddir = ../..
-include ../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 DIRS := access bootstrap catalog parser commands executor lib libpq \
 	main nodes optimizer port postmaster regex rewrite \

src/backend/access/Makefile

 #
 # Makefile for the access methods module
 #
-# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.6 2000/07/13 16:06:42 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.7 2000/08/31 16:09:26 petere Exp $
 #
 
 subdir = src/backend/access
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 SUBDIRS	    := common gist hash heap index nbtree rtree transam
 SUBDIROBJS  := $(SUBDIRS:%=%/SUBSYS.o)

src/backend/access/common/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.18 2000/05/29 05:44:33 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.19 2000/08/31 16:09:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/common
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \
        scankey.o tupdesc.o  

src/backend/access/gist/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/gist
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.9 2000/05/29 05:44:34 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.10 2000/08/31 16:09:31 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/gist
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = gist.o gistget.o gistscan.o giststrat.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/access/hash/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/hash
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.9 2000/05/29 05:44:35 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.10 2000/08/31 16:09:33 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/hash
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \
        hashsearch.o hashstrat.o hashutil.o

src/backend/access/heap/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/heap
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.10 2000/05/29 05:44:35 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.11 2000/08/31 16:09:33 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/heap
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = heapam.o hio.o stats.o tuptoaster.o
 

src/backend/access/index/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/index
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.9 2000/05/29 05:44:38 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.10 2000/08/31 16:09:36 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/index
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = genam.o indexam.o istrat.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/access/nbtree/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/nbtree
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.9 2000/05/29 05:44:39 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.10 2000/08/31 16:09:41 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/nbtree
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \
        nbtstrat.o nbtutils.o nbtsort.o

src/backend/access/rtree/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/rtree
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.9 2000/05/29 05:44:39 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.10 2000/08/31 16:09:43 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/rtree
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o
 

src/backend/access/transam/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for access/transam
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.11 2000/05/29 05:44:41 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.12 2000/08/31 16:09:46 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/access/transam
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o
 
@@ -26,7 +27,7 @@ clean:
 
 # ensure that version checks in xlog.c get recompiled when config.h or
 # catversion.h changes, even if "make depend" hasn't been done.
-xlog.o: xlog.c $(SRCDIR)/include/config.h $(SRCDIR)/include/catalog/catversion.h
+xlog.o: xlog.c $(top_builddir)/src/include/config.h $(top_srcdir)/src/include/catalog/catversion.h
 
 ifeq (depend,$(wildcard depend))
 include depend

src/backend/catalog/Makefile

@@ -2,13 +2,13 @@
 #
 # Makefile for catalog
 #
-# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.23 2000/07/06 21:33:22 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.24 2000/08/31 16:09:49 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/backend/catalog
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 OBJS = catalog.o heap.o index.o indexing.o aclchk.o \
        pg_aggregate.o pg_operator.o pg_proc.o pg_type.o

src/backend/commands/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.25 2000/05/29 17:40:43 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.26 2000/08/31 16:09:53 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include $(SRCDIR)/Makefile.global
+subdir = src/backend/commands
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \
        remove.o rename.o vacuum.o analyze.o view.o cluster.o \
@@ -30,4 +31,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/executor/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for executor
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.12 2000/05/29 05:44:45 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.13 2000/08/31 16:09:56 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/executor
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
        execProcnode.o execQual.o execScan.o execTuples.o \
@@ -33,4 +34,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/lib/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for lib (miscellaneous stuff)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.14 2000/06/28 03:31:34 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.15 2000/08/31 16:09:59 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/lib
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = bit.o hasht.o lispsort.o stringinfo.o dllist.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/main/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for main
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.8 2000/05/29 05:44:47 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.9 2000/08/31 16:10:03 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/main
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = main.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/nodes/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for backend/nodes
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.12 2000/06/29 02:26:23 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.13 2000/08/31 16:10:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include $(SRCDIR)/Makefile.global
+subdir = src/backend/nodes
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = nodeFuncs.o nodes.o list.o \
        copyfuncs.o equalfuncs.o makefuncs.o \

src/backend/optimizer/Makefile

 #
 # Makefile for optimizer
 #
-# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.8 2000/07/13 16:06:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.9 2000/08/31 16:10:07 petere Exp $
 #
 
 subdir = src/backend/optimizer
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 SUBDIRS     := geqo path plan prep util
 SUBDIROBJS  := $(SUBDIRS:%=%/SUBSYS.o)

src/backend/optimizer/geqo/Makefile

@@ -5,24 +5,19 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Id: Makefile,v 1.15 2000/05/31 00:28:19 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Makefile,v 1.16 2000/08/31 16:10:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
-
-ifeq ($(CC), gcc)
-CFLAGS+= -Wno-error
-endif
+subdir = src/backend/optimizer/geqo
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS =	geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
 	geqo_pool.o geqo_recombination.o \
 	geqo_selection.o \
 	geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o
 
-# deprecated: minspantree.o
-
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
@@ -37,4 +32,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/optimizer/path/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for optimizer/path
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.14 2000/05/29 05:44:50 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.15 2000/08/31 16:10:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/optimizer/path
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = allpaths.o clausesel.o costsize.o indxpath.o \
        joinpath.o joinrels.o orindxpath.o pathkeys.o tidpath.o
@@ -28,4 +29,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/optimizer/plan/Makefile

@@ -4,17 +4,16 @@
 #    Makefile for optimizer/plan
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.10 2000/05/29 05:44:51 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.11 2000/08/31 16:10:11 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/optimizer/plan
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o
 
-# not ready yet: predmig.o xfunc.o
-
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
@@ -29,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/optimizer/prep/Makefile

@@ -4,17 +4,16 @@
 #    Makefile for optimizer/prep
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.11 2000/05/29 05:44:52 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.12 2000/08/31 16:10:13 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/optimizer/prep
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o
 
-# not ready yet: predmig.o xfunc.o
-
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)

src/backend/optimizer/util/Makefile

@@ -4,18 +4,17 @@
 #    Makefile for optimizer/util
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.12 2000/05/29 05:44:53 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.13 2000/08/31 16:10:14 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/optimizer/util
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \
        joininfo.o pathnode.o relnode.o tlist.o var.o
 
-# not ready yet: predmig.o xfunc.o
-
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
@@ -30,4 +29,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/port/Makefile.in

@@ -13,12 +13,13 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.23 2000/05/29 05:44:54 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.24 2000/08/31 16:10:16 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR=../..
-include ../../Makefile.global
+subdir = src/backend/port
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@
 OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@
@@ -39,8 +40,6 @@ qnx4.dir:
 tas.o: tas.s
 	$(CC) $(CFLAGS) -c tas.s
 
-.PHONY: clean dep
-
 distclean clean:
 	rm -f SUBSYS.o $(OBJS)
 

src/backend/port/nextstep/Makefile

 #-------------------------------------------------------------------------
 #
-# Makefile--
-#    Makefile for port/next (NeXTStep 3.3 specific stuff)
+# Makefile for NeXTStep 3.3 specific stuff
+#
+# $Header: /cvsroot/pgsql/src/backend/port/nextstep/Makefile,v 1.6 2000/08/31 16:10:16 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/port/nextstep
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = dynloader.o port.o
 

src/backend/port/qnx4/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for port/sparc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/Makefile,v 1.2 2000/05/29 05:44:56 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/Makefile,v 1.3 2000/08/31 16:10:19 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/port/qnx4
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = isnan.o rint.o sem.o shm.o
 
@@ -36,4 +37,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/port/sunos4/Makefile

-#-------------------------------------------------------------------------
-#
-# Makefile--
-#    Makefile for port/sparc
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.5 2000/05/29 05:44:57 tgl Exp $
-#
-#-------------------------------------------------------------------------
+# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.6 2000/08/31 16:10:20 petere Exp $
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/port/sunos4
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = strtol.o
 
@@ -27,4 +20,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/postmaster/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for postmaster
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.11 2000/05/29 05:44:58 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.12 2000/08/31 16:10:23 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/postmaster
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = postmaster.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/regex/Makefile

@@ -4,14 +4,15 @@
 #    Makefile for regex
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.13 2000/05/29 05:44:58 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.14 2000/08/31 16:10:25 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/regex
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
-CFLAGS += -DPOSIX_MISTAKE 
+CPPFLAGS += -DPOSIX_MISTAKE 
 
 DEBUGOBJ =
 
@@ -27,7 +28,7 @@ SUBSYS.o: $(OBJS)
 	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
 retest: retest.o SUBSYS.o $(DEBUGOBJ)
-	$(CC) -o retest retest.o SUBSYS.o $(DEBUGOBJ)
+	$(CC) $(CFLAGS) -o retest retest.o SUBSYS.o $(DEBUGOBJ)
 
 depend dep:
 	$(CC) -MM $(CFLAGS) *.c >depend
@@ -38,4 +39,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/rewrite/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for rewrite
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.12 2000/05/29 05:44:59 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.13 2000/08/31 16:10:27 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/rewrite
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = rewriteRemove.o rewriteDefine.o \
        rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o
@@ -28,4 +29,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/storage/Makefile

 #
 # Makefile for the storage manager subsystem
 #
-# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.7 2000/07/13 16:06:48 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.8 2000/08/31 16:10:30 petere Exp $
 #
 
 subdir = src/backend/storage
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 SUBDIRS     := buffer file ipc large_object lmgr page smgr
 SUBDIROBJS  := $(SUBDIRS:%=%/SUBSYS.o)

src/backend/storage/buffer/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for storage/buffer
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.14 2000/05/29 05:45:00 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.15 2000/08/31 16:10:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/storage/buffer
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o
 

src/backend/storage/file/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for storage/file
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.9 2000/05/29 05:45:03 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.10 2000/08/31 16:10:31 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/storage/file
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = fd.o buffile.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/storage/ipc/Makefile

 #
 # Makefile for storage/ipc
 #
-# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.12 2000/07/13 16:06:54 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.13 2000/08/31 16:10:33 petere Exp $
 #
 
 subdir = src/backend/storage/ipc
 top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 # seems to be required 1999/07/22 bjm
 ifeq ($(CPU), alpha)

src/backend/storage/large_object/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for storage/large_object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.9 2000/05/29 05:45:07 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.10 2000/08/31 16:10:34 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/storage/large_object
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = inv_api.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/storage/lmgr/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for storage/lmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.13 2000/05/29 05:45:08 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.14 2000/08/31 16:10:36 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/storage/lmgr
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = lmgr.o lock.o proc.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/storage/page/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for storage/page
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.9 2000/05/29 05:45:12 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.10 2000/08/31 16:10:37 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/storage/page
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS =  bufpage.o itemptr.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/storage/smgr/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for storage/smgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.12 2000/05/29 05:45:14 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.13 2000/08/31 16:10:38 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/storage/smgr
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = md.o mm.o smgr.o smgrtype.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/tcop/Makefile

@@ -4,16 +4,13 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.23 2000/05/29 05:45:16 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.24 2000/08/31 16:10:40 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR= ../..
-include $(SRCDIR)/Makefile.global
-
-ifeq ($(CC), gcc)
-CFLAGS+= -Wno-error
-endif
+subdir = src/backend/tcop
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
 
@@ -31,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/tioga/Makefile

@@ -4,14 +4,16 @@
 #    Makefile for tioga
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.7 2000/05/29 05:45:18 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.8 2000/08/31 16:10:41 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
-include ../../Makefile.global
+subdir = src/backend/tioga
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = tgRecipe.o Varray.o
+CPPFLAGS += -I$(srcdir)
 
 all: SUBSYS.o
 
@@ -27,4 +29,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/Makefile

 #
 # Makefile for utils
 #
-# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.17 2000/07/13 16:07:06 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.18 2000/08/31 16:10:42 petere Exp $
 #
 
 subdir = src/backend/utils/
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 SUBDIRS     := adt cache error fmgr hash init misc mmgr sort time
 ifdef MULTIBYTE

src/backend/utils/adt/Makefile

 #
 # Makefile for utils/adt
 #
-# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.44 2000/08/05 14:59:17 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.45 2000/08/31 16:10:45 petere Exp $
 #
 
 subdir = src/backend/utils/adt
 top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 # seems to be required for some date/time stuff 1999/07/22 bjm
 ifeq ($(CPU),alpha)
@@ -40,6 +40,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-
-
-

src/backend/utils/cache/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/cache
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.13 2000/05/29 05:45:24 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.14 2000/08/31 16:10:46 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/cache
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o \
 	fcache.o temprel.o
@@ -28,4 +29,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/error/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/error
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.8 2000/05/29 05:45:27 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.9 2000/08/31 16:10:48 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/error
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = assert.o elog.o exc.o excabort.o excid.o format.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/fmgr/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/fmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.9 2000/05/29 05:45:30 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.10 2000/08/31 16:10:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/fmgr
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = dfmgr.o fmgr.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/hash/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/hash
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.8 2000/05/29 05:45:30 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.9 2000/08/31 16:10:51 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/hash
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = dynahash.o hashfn.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/init/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/init
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.14 2000/06/28 03:32:43 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.15 2000/08/31 16:10:52 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/init
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = findbe.o globals.o miscinit.o postinit.o
 

src/backend/utils/mb/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/mb
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.9 2000/08/27 10:40:48 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.10 2000/08/31 16:10:56 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/mb
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \
        big5.o
@@ -47,4 +48,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/mmgr/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/mmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.9 2000/06/28 03:32:50 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.10 2000/08/31 16:10:58 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/mmgr
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = aset.o mcxt.o portalmem.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/sort/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/sort
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.11 2000/06/18 22:44:20 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.12 2000/08/31 16:10:59 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/sort
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = logtape.o tuplesort.o tuplestore.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/backend/utils/time/Makefile

@@ -4,12 +4,13 @@
 #    Makefile for utils/time
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.8 2000/05/29 05:45:42 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.9 2000/08/31 16:11:01 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../../..
-include ../../../Makefile.global
+subdir = src/backend/utils/time
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 OBJS = tqual.o
 
@@ -27,4 +28,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-

src/bin/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.30 2000/08/26 13:08:15 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.31 2000/08/31 16:11:03 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin
 top_builddir = ../..
-include ../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
 	pg_passwd psql scripts pg-config

src/bin/initdb/Makefile

@@ -4,17 +4,17 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.20 2000/07/06 21:33:38 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.21 2000/08/31 16:11:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/initdb
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: initdb
 
-initdb: initdb.sh ../../Makefile.global
+initdb: initdb.sh $(top_builddir)/src/Makefile.global
 	sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/g' \
 	    -e 's/__VERSION__/$(VERSION)/g' \
 	    -e 's:__bindir__:$(bindir):g' \

src/bin/initlocation/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.9 2000/06/27 00:31:00 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.10 2000/08/31 16:11:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/initlocation
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: initlocation
 

src/bin/ipcclean/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.11 2000/06/27 00:31:05 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.12 2000/08/31 16:11:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/ipcclean
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: ipcclean
 

src/bin/pg_ctl/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1999, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.6 2000/06/27 00:31:08 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.7 2000/08/31 16:11:10 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pg_ctl
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: pg_ctl
 

src/bin/pg_dump/Makefile

@@ -4,27 +4,27 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.22 2000/08/01 15:51:44 pjw Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.23 2000/08/31 16:11:13 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pg_dump
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \
        pg_backup_null.o pg_backup_tar.o $(STRDUP)
 
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS+= -I$(libpq_srcdir)
 LIBS+= -lz
 
 all: submake pg_dump pg_restore pg_dumpall
 
-pg_dump: pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a 
-	$(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(LIBPQ) $(LDFLAGS)
+pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a 
+	$(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS)
 
-pg_restore: pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(LIBPQ) $(LDFLAGS)
+pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
+	$(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(libpq) $(LDFLAGS)
 
 ../../utils/strdup.o:
 	$(MAKE) -C ../../utils strdup.o
@@ -37,7 +37,7 @@ pg_dumpall: pg_dumpall.sh
 
 .PHONY: submake
 submake:
-	$(MAKE) -C $(LIBPQDIR) all
+	$(MAKE) -C $(libpq_builddir) all
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_dump$(X) $(bindir)/pg_dump$(X)

src/bin/pg_encoding/Makefile

@@ -4,25 +4,25 @@
 #
 # Copyright (c) 1998, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.9 2000/06/28 18:29:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.10 2000/08/31 16:11:15 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pg_encoding
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 OBJS= pg_encoding.o
 
 all: submake pg_encoding$(X)
 
 pg_encoding$(X): $(OBJS)
-	$(CC) -o $@ $(OBJS) $(LIBPQ) $(LDFLAGS) $(CFLAGS)
+	$(CC) -o $@ $(OBJS) $(libpq) $(LDFLAGS) $(CFLAGS)
 
 .PHONY: submake
 
 submake:
-	$(MAKE) -C $(LIBPQDIR) all
+	$(MAKE) -C $(libpq_builddir) all
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_encoding$(X) $(bindir)/pg_encoding$(X)

src/bin/pg_id/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (C) 2000 by PostgreSQL Global Development Team
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.17 2000/06/27 00:31:20 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.18 2000/08/31 16:11:17 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pg_id
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: pg_id$(X)
 

src/bin/pg_passwd/Makefile

-#
-# Makefile for src/bin/pg_passwd
-#
+# $Header: /cvsroot/pgsql/src/bin/pg_passwd/Attic/Makefile,v 1.10 2000/08/31 16:11:20 petere Exp $
 
 subdir = src/bin/pg_passwd
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: pg_passwd$(X)
 

src/bin/pgaccess/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.10 2000/06/28 18:29:22 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.11 2000/08/31 16:11:20 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pgaccess
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 pgaccessdir = $(datadir)/pgaccess
 

src/bin/pgtclsh/Makefile

@@ -5,13 +5,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.30 2000/07/01 15:02:23 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.31 2000/08/31 16:11:21 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/pgtclsh
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 #
 # Include definitions from the tclConfig.sh file
@@ -21,7 +21,11 @@ ifeq ($(USE_TK), true)
 -include Makefile.tkdefs
 endif
 
-CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR)
+libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
+libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
+libpgtcl = -L$(libpgtcl_builddir) -lpgtcl
+
+CFLAGS+= $(X_CFLAGS) -I$(libpgtcl_srcdir)
 
 
 # If we are here then TCL is available
@@ -36,16 +40,16 @@ all: submake $(PROGRAMS)
 
 pgtclsh: pgtclAppInit.o
 	$(CC) $(CFLAGS) $(TCL_DEFS) -o $@ $< \
-	  $(LIBPGTCL) $(LIBPQ) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
+	  $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
 
 pgtksh: pgtkAppInit.o
 	$(CC) $(CFLAGS) $(TK_DEFS) -o $@ $< \
-	  $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
+	  $(libpgtcl) $(libpq) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
 	  $(TCL_LIB_SPEC) $(X11_LIBS) $(LDFLAGS)
 
 .PHONY: submake
 submake:
-	$(MAKE) -C $(LIBPGTCLDIR) all
+	$(MAKE) -C $(libpgtcl_builddir) all
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pgtclsh $(bindir)/pgtclsh

src/bin/psql/Makefile

@@ -4,17 +4,17 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.23 2000/07/19 16:29:56 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.24 2000/08/31 16:11:23 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/psql
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
 
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS+= -I$(libpq_srcdir)
 
 OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \
 	copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \
@@ -47,8 +47,8 @@ endif
 
 # End of hacks for picking up backend 'port' modules
 
-psql$(X): $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ) $(LDFLAGS)
+psql$(X): $(OBJS) $(libpq_builddir)/libpq.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq) $(LDFLAGS)
 
 help.o: $(srcdir)/sql_help.h
 
@@ -63,7 +63,7 @@ endif
 .PHONY: submake
 
 submake:
-	$(MAKE) -C $(LIBPQDIR) all
+	$(MAKE) -C $(libpq_builddir) all
 
 distprep: $(srcdir)/sql_help.h
 

src/bin/scripts/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.7 2000/08/20 11:56:29 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.8 2000/08/31 16:11:25 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/scripts
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 SCRIPTS := createdb dropdb createuser dropuser createlang droplang vacuumdb
 

src/include/Makefile

@@ -5,13 +5,13 @@
 # Install exported headers to the include directory (these headers are
 # the minimal ones needed to build loadable backend extensions).
 #
-# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.2 2000/07/19 16:29:58 petere Exp $
+# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.3 2000/08/31 16:11:27 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/include
 top_builddir = ../..
-include ../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 
 HEADERS := os.h config.h c.h postgres.h postgres_ext.h fmgr.h \

src/interfaces/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.41 2000/07/19 16:30:06 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.42 2000/08/31 16:11:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/interfaces
 top_builddir = ../..
-include ../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 DIRS := libpq ecpg libpgeasy
 

src/interfaces/ecpg/Makefile

 subdir = src/interfaces/ecpg
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all install installdirs uninstall dep depend distprep:
 	$(MAKE) -C include $@

src/interfaces/ecpg/include/Makefile

 subdir = src/interfaces/ecpg/include
 top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 install: all installdirs install-headers
 

src/interfaces/ecpg/lib/Makefile

@@ -4,25 +4,25 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.6 2000/06/28 18:29:39 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.7 2000/08/31 16:11:36 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/interfaces/ecpg/lib
 top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 NAME= ecpg
 SO_MAJOR_VERSION= 3
 SO_MINOR_VERSION= 1.1
 
-CFLAGS+= -I$(top_srcdir)/src/interfaces/ecpg/include -I$(LIBPQDIR)
+CPPFLAGS += -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)
 
 
 OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
 	connect.o misc.o
 
-SHLIB_LINK= $(LIBPQ)
+SHLIB_LINK= $(libpq)
 
 all: all-lib
 

src/interfaces/ecpg/preproc/Makefile

 subdir = src/interfaces/ecpg/preproc
 top_builddir = ../../../..
-include ../../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 MAJOR_VERSION=2
 MINOR_VERSION=7
 PATCHLEVEL=1
 
-CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
+CPPFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
 	-DINCLUDE_PATH=\"$(includedir)\" 
 

src/interfaces/libpgeasy/Makefile

@@ -2,13 +2,13 @@
 #
 # Makefile for src/interfaces/libpgeasy
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.1 2000/06/28 18:29:41 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.2 2000/08/31 16:11:42 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/interfaces/libpgeasy
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 
 # shared library parameters
@@ -16,11 +16,11 @@ NAME= pgeasy
 SO_MAJOR_VERSION= 2
 SO_MINOR_VERSION= 1
 
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS += -I$(libpq_srcdir)
 
 OBJS= libpgeasy.o halt.o
 
-SHLIB_LINK+= $(LIBPQ)
+SHLIB_LINK+= $(libpq)
 
 # If crypt is a separate library, rather than part of libc, it may need
 # to be referenced separately to keep (broken) linkers happy.  (This is

src/interfaces/libpgtcl/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.19 2000/06/28 18:29:43 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.20 2000/08/31 16:11:45 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,11 +16,11 @@ NAME= pgtcl
 SO_MAJOR_VERSION= 2
 SO_MINOR_VERSION= 1
 
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS += -I$(libpq_srcdir)
 
 OBJS= pgtcl.o pgtclCmds.o pgtclId.o
 
-SHLIB_LINK+= $(LIBPQ)
+SHLIB_LINK+= $(libpq)
 
 # If crypt is a separate library, rather than part of libc, it may need
 # to be referenced separately to keep (broken) linkers happy.  (This is

src/interfaces/libpq++/Makefile

@@ -4,27 +4,27 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.23 2000/06/30 16:10:54 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.24 2000/08/31 16:11:51 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/interfaces/libpq++
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 NAME= pq++
 SO_MAJOR_VERSION= 3
 SO_MINOR_VERSION= 1
 
 SRCHEADERDIR = $(top_srcdir)/src/include
-CXXFLAGS+= -I$(SRCHEADERDIR) -I$(LIBPQDIR)
+CXXFLAGS+= -I$(SRCHEADERDIR) -I$(libpq_srcdir)
 
 OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o 
 
 ifeq ($(PORTNAME), win)
-SHLIB_LINK+= --driver-name g++ $(LIBPQ)
+SHLIB_LINK+= --driver-name g++ $(libpq)
 else
-SHLIB_LINK= $(LIBPQ)
+SHLIB_LINK= $(libpq)
 endif
 
 # For CC on IRIX, must use CC as linker/archiver of C++ libraries

src/interfaces/libpq/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.39 2000/06/28 18:29:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.40 2000/08/31 16:11:48 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/interfaces/libpq
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 # shared library parameters
 NAME= pq

src/interfaces/odbc/GNUmakefile

@@ -2,20 +2,20 @@
 #
 # GNUMakefile for psqlodbc (Postgres ODBC driver)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.1 2000/06/28 18:29:54 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.2 2000/08/31 16:11:55 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/interfaces/odbc
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 # Shared library parameters
 NAME = psqlodbc
 SO_MAJOR_VERSION = 0
 SO_MINOR_VERSION = 26
 
-CFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
+CPPFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
 
 
 OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \

src/interfaces/perl5/GNUmakefile

@@ -4,11 +4,11 @@
 # Makefile according to its own ideas and then invoke the rules from
 # that file.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/perl5/Attic/GNUmakefile,v 1.1 2000/06/28 18:29:56 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/perl5/Attic/GNUmakefile,v 1.2 2000/08/31 16:11:58 petere Exp $
 
 subdir = src/interfaces/perl5
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 
 all: Makefile libpq-all
@@ -19,7 +19,7 @@ Makefile: Makefile.PL
 
 .PHONY: libpq-all
 libpq-all:
-	$(MAKE) -C $(top_builddir)/src/interfaces/libpq all
+	$(MAKE) -C $(libpq_builddir) all
 
 # The klugery here is to ensure that the perl5 shared library gets
 # built with the correct path to the installed location of libpq

src/interfaces/python/GNUmakefile

@@ -4,20 +4,20 @@
 #
 # Written by Peter Eisentraut  <peter_e@gmx.net>
 #
-# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.1 2000/06/28 18:30:07 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.2 2000/08/31 16:12:01 petere Exp $
 #
 #-------------------------------------------------------------------
 
 subdir = src/interfaces/python
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all: Makefile pgmodule.c libpq-all
 	$(MAKE) -f Makefile
 
 .PHONY: libpq-all
 libpq-all:
-	$(MAKE) -C $(top_builddir)/src/interfaces/libpq all
+	$(MAKE) -C $(libpq_builddir) all
 
 Makefile: Setup.in Makefile.pre.in
 	$(MAKE) -f Makefile.pre.in boot srcdir=$(srcdir) VPATH=$(srcdir)
@@ -26,10 +26,11 @@ Makefile.pre.in: $(python_extmakefile)
 	cp $< $@
 
 Setup.in: Setup.in.raw
-	sed -e "s%__LIBPQ__%${top_srcdir}/src/interfaces/libpq%g" \
-	    -e "s%__EXTRA_LIBS__%${LIBS}%g" \
-	    -e "s%__INCLUDES__%${top_srcdir}/src/include%g" \
-	    < $< > $@
+	sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \
+	    -e 's,@libpq_builddir@,$(libpq_builddir),g' \
+	    -e 's,@EXTRA_LIBS@,$(LIBS),g' \
+	    -e 's,@pg_includedir@,$(top_srcdir)/src/include,g' \
+	    $< > $@
 
 install: all
 	@echo "Installing Python module"

src/interfaces/python/Setup.in.raw

 *shared*
 
-_pg  pgmodule.c -I__LIBPQ__ -I__INCLUDES__ -L__LIBPQ__ -lpq __EXTRA_LIBS__
+_pg  pgmodule.c -I@libpq_srcdir@ -I@pg_includedir@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@

src/makefiles/Makefile.aix

@@ -10,16 +10,16 @@ IMPSUFF= .imp
 
 POSTGRES_IMP= postgres$(IMPSUFF)
 
-MKLDEXPORT=$(SRCDIR)/backend/port/aix/mkldexport.sh
+MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
 
 $(POSTGRES_IMP):
 	@echo Making $@
-	$(MKLDEXPORT) postgres $(BINDIR) > $@
-	$(CC) -Wl,-bE:$(SRCDIR)/backend/$@ -o postgres $(OBJS) $(LDFLAGS)
+	$(MKLDEXPORT) postgres $(bindir) > $@
+	$(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS)
 
 %$(EXPSUFF):
 	$(MKLDEXPORT) $*.o `pwd` > $*$(EXPSUFF)
 
 %$(DLSUFFIX): %.o %$(EXPSUFF)
 	@echo Making share library $@ from $*.o, $*$(EXPSUFF), and installed postgres.imp
-	$(LD) -H512 -bM:SRE -bI:$(LIBDIR)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(CFLAGS_SL)
+	$(LD) -H512 -bM:SRE -bI:$(libdir)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(CFLAGS_SL)

src/makefiles/Makefile.hpux

@@ -19,11 +19,11 @@ ifneq ($(HPUXMATHLIB),)
    LDFLAGS:= -L /lib/pa1.1 $(LDFLAGS)
 endif
 
-# On all HPUX versions, embed LIBDIR as the shared library search path
+# On all HPUX versions, embed `libdir' as the shared library search path
 # so that the executables don't need SHLIB_PATH to be set, specify -z
 # to catch null pointer dereferences, and specify -E to make all symbols
 # visible to dynamically linked shared libraries.
-LDFLAGS+= -Wl,+b -Wl,$(LIBDIR) -Wl,-z -Wl,-E
+LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z -Wl,-E
 
 # Rule for building shared libs (currently used only for regression test
 # shlib ... should go away, since this is not really enough knowledge)

src/makefiles/Makefile.win

@@ -2,7 +2,7 @@ CFLAGS+= -I/usr/local/include
 LDFLAGS+= -g
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
-DLLLIBS=-L/usr/local/lib -L$(LIBDIR) -L$(SRCDIR)/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32
+DLLLIBS=-L/usr/local/lib -L$(libdir) -L$(top_builddir)/src/backend -lpostgres -lcygipc -lcygwin -lcrypt -lkernel32
 X=.exe
 MK_NO_LORDER=true
 MAKE_DLL=true
@@ -11,7 +11,7 @@ SHLIB_LINK=$(DLLLIBS)
 
 %.dll: %.o
 	$(DLLTOOL) --export-all --output-def $*.def $<
-	$(DLLWRAP) -o $@ --def $*.def $< $(SRCDIR)/utils/dllinit.o $(DLLLIBS)
+	$(DLLWRAP) -o $@ --def $*.def $< $(top_builddir)/src/utils/dllinit.o $(DLLLIBS)
 	rm -f $*.def
 
 curdir:=$(shell pwd)

src/pl/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.11 2000/07/19 16:30:16 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.12 2000/08/31 16:12:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/pl
 top_builddir = ../..
-include ../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 DIRS := plpgsql
 

src/pl/plperl/GNUmakefile

-# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.2 2000/06/28 18:30:12 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.3 2000/08/31 16:12:13 petere Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 plperl_installdir = $(libdir)
 

src/pl/plpgsql/Makefile

@@ -4,13 +4,13 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/pl/plpgsql/Makefile,v 1.4 2000/07/19 16:30:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plpgsql/Makefile,v 1.5 2000/08/31 16:12:15 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/pl/plpgsql
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all install installdirs uninstall distprep:
 	$(MAKE) -C src $@

src/pl/tcl/Makefile

@@ -2,13 +2,13 @@
 #
 # Makefile for the pltcl shared object
 #
-# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.21 2000/07/17 01:26:42 tgl Exp $
+# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.22 2000/08/31 16:12:17 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/pl/tcl
 top_builddir = ../../..
-include ../../Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 -include Makefile.tcldefs
 

src/test/bench/Makefile

@@ -7,17 +7,18 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.6 2000/06/17 00:10:28 petere Exp $
+#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.7 2000/08/31 16:12:20 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR= ../..
-include ../../Makefile.global
+subdir = src/test/bench
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 CREATEFILES= create.sql bench.sql
 OUTFILES= bench.out bench.out.perquery
 
-CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
+CFLAGS+= -I$(libpq_srcdir) $(CFLAGS_SL)
 
 
 all: $(CREATEFILES)

src/test/examples/Makefile

@@ -2,12 +2,13 @@
 # Makefile for example programs
 #
 
-SRCDIR= ../..
-include ../../Makefile.global
+subdir = src/test/examples
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
-CFLAGS+= -I$(LIBPQDIR)
+CPPFLAGS+= -I$(libpq_srcdir)
 
-LDFLAGS+= -L$(LIBPQDIR) -lpq 
+LDFLAGS+= $(libpq)
 
 
 # PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo

src/test/locale/Makefile

-#
-# Makefile for example programs
-#
+# $Header: /cvsroot/pgsql/src/test/locale/Makefile,v 1.5 2000/08/31 16:12:25 petere Exp $
 
-SRCDIR= ../..
-include ../../Makefile.global
+subdir = src/test/locale
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
 
 
 PROGS = test-pgsql-locale test-ctype
@@ -17,9 +16,7 @@ $(PROGS): % : %.c
 clean: 
 	rm -f $(PROGS) *.out
 	for d in $(DIRS); do \
-		cd $$d; \
-		$(MAKE) clean; \
-		cd ..; \
+		$(MAKE) -C $$d clean
 	done
 
 test-%: all

src/test/regress/GNUmakefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.22 2000/07/23 13:01:10 petere Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.23 2000/08/31 16:12:26 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,9 +19,9 @@ CONTRIB= $(top_builddir)/contrib
 
 HOST := $(shell $(top_srcdir)/config/config.guess)
 
-CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
+CFLAGS+= -I$(libpq_srcdir) $(CFLAGS_SL)
 
-LDADD+= -L$(LIBPQDIR) -lpq
+LDADD+= $(libpq)
         
 #
 # DLOBJS is the dynamically-loaded object file.  The regression test uses 

src/test/regress/input/Makefile

@@ -7,12 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.8 2000/01/09 19:34:40 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.9 2000/08/31 16:12:28 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR= ../../..
-include ../../../Makefile.global
+subdir = src/test/regress/input
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 #
 # ... plus test query inputs
@@ -34,5 +35,5 @@ all: $(INFILES)
 	OBJ=`pwd`; \
 	sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
 	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-	    -e "s:_LIBDIR_:$(LIBDIR):g" \
+	    -e "s:_LIBDIR_:$(libdir):g" \
 	    -e "s/_USER_/$$USER/g" < $< > ../sql/$@

src/test/regress/output/Makefile

@@ -7,12 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.10 2000/01/09 19:34:40 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.11 2000/08/31 16:12:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR= ../../..
-include ../../../Makefile.global
+subdir = src/test/regress/output
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
 
 #
 # ... plus test query inputs
@@ -34,7 +35,6 @@ all: $(INFILES)
 	OBJ=`pwd`; \
 	sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
 	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-	    -e "s:_LIBDIR_:$(LIBDIR):g" \
+	    -e "s:_LIBDIR_:$(libdir):g" \
 	    -e "s/_USER_/$$USER/g" < $< | \
 	sed -e "s:output/\.\.:input/\.\.:g" > ../expected/$@
-