Standardize all LDADD to LD_ADD.

src/Makefile.global

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.81 1997/01/03 06:07:18 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.82 1997/01/05 21:16:54 bryanh Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -45,21 +45,23 @@
 # of the port.
 
 #  The name of the port.  Valid choices are:
-#   aix            IBM on AIX 3.2.5
 #   alpha          DEC Alpha AXP on OSF/1 2.0
-#   BSD44_derived  OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
-#   bsdi           BSD/OS 2.0, 2.01, 2.1
-#   dgux           DG/UX 5.4R3.10
 #   hpux           HP PA-RISC on HP-UX 9.0
 #   i386_solaris   i386 Solaris
-#   irix5          SGI MIPS on IRIX 5.3
-#   linux          Intel x86 on Linux 1.2 and Linux ELF
-#                  (For non-ELF Linux, see LINUX_ELF below).
-#   next           Motorola MC68K or Intel x86 on NeXTSTEP 3.2
 #   sparc_solaris  SUN SPARC on Solaris 2.4
 #   sunos4          SUN SPARC on SunOS 4.1.3
-#   svr4           Intel x86 on Intel SVR4
 #   ultrix4        DEC MIPS on Ultrix 4.4
+#   linux          Intel x86 on Linux 1.2 and Linux ELF
+#                  (For non-ELF Linux, see LINUX_ELF below).
+#   BSD44_derived  OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
+#   bsdi           BSD/OS 2.0, 2.01, 2.1
+#   aix            IBM on AIX 3.2.5
+#   irix5          SGI MIPS on IRIX 5.3
+#   dgux           DG/UX 5.4R3.10
+#  Some hooks are provided for
+#   svr4           Intel x86 on Intel SVR4
+#   next           Motorola MC68K or Intel x86 on NeXTSTEP 3.2
+#  but these are guaranteed not to work as of yet.
 #
 #  Note that portname is defined here to be UNDEFINED to remind you
 #  to change it in Makefile.custom.
@@ -779,6 +781,6 @@ CFLAGS+= -D$(PORTNAME)
 
 # include port-specific flags
 CFLAGS+= $(CFLAGS_BE)
-LDADD+= $(LDADD_BE)
+LD_ADD+= $(LDADD_BE)
 LDFLAGS+= $(LDFLAGS_BE)
 

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.17 1996/11/23 09:51:57 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.18 1997/01/05 21:17:21 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -62,7 +62,7 @@ endif
 all: postgres $(EXP) global1.bki.source local1_template1.bki.source
 
 postgres: postgres_group1 postgres_group2 postgres_group3 postgres_group4 
-	$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LDADD)
+	$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LD_ADD)
 
 postgres_group1:
 	$(MAKE) -C access     all   
@@ -98,7 +98,7 @@ global1.bki.source local1_template1.bki.source:
 # The postgres.o target is needed by the rule in Makefile.global that
 # creates the exports file when MAKE_EXPORTS = true.
 postgres.o: $(OBJS)
-	$(CC) $(LDFLAGS) -r -o postgres.o $(OBJS) $(LDADD)
+	$(CC) $(LDFLAGS) -r -o postgres.o $(OBJS) $(LD_ADD)
 
 
 ############################################################################
@@ -208,7 +208,7 @@ $(BINDIR) $(LIBDIR) $(HEADERDIR):
 # are up to date.  It saves the time of doing all the submakes.
 .PHONY: quick
 quick: $(OBJS)
-	$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LDADD)
+	$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LD_ADD)
 
 #
 # Build the file, "./ID", used by the "gid" (grep-for-identifier) tool

src/test/regress/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.11 1996/12/02 06:31:08 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.12 1997/01/05 21:17:36 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,8 +16,6 @@ include ../../Makefile.global
 
 CFLAGS+= -I$(LIBPQDIR) -I../../include
 
-LDADD+= -L$(LIBPQDIR) -lpq
-        
 #
 # DLOBJS is the dynamically-loaded object file.  The regression test uses 
 # this when it does a CREATE FUNCTION ... LANGUAGE 'C').

src/tutorial/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for tutorial
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.4 1996/11/18 06:07:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.5 1997/01/05 21:17:45 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,8 +13,6 @@ include ../Makefile.global
 
 CFLAGS+= -I$(LIBPQDIR) -I../../include
 
-LDADD+= -L$(LIBPQDIR) -lpq
-        
 #
 # DLOBJS is the dynamically-loaded object files.  The "funcs" queries
 # include CREATE FUNCTIONs that load routines from these files.