Here is a patch for Versions 1 and 2 that corrects the following makefile

scrappy · scrappy · commit b2692ecaa94b · 1996-08-21T04:28:13.000Z
bugs:

  1) linker flags LDFLAGS are missing on some of the links.

  2) libpq.a is not listed as a dependency for the src/bin programs
     that depend on it.

--
Bryan Henderson                                    Phone 408-227-6803
San Jose, California
diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.6 1996/07/25 01:11:15 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.6.2.1 1996/08/21 04:28:02 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,8 @@ LIBPQ:=   -L$(srcdir)/libpq/$(objdir) -lpq
 
 LD_ADD+= $(LIBPQ)
 DPADD+= $(LIBPQ)
-
+# LIB_DEP is the list of dependencies on libraries for the link.
+LIB_DEP+= $(srcdir)/libpq/$(objdir)/libpq.a
 
 #
 # And where libpq goes, so goes the authentication stuff...
diff --git a/src/mk/postgres.lib.mk b/src/mk/postgres.lib.mk
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.1.1.1.2.1 1996/08/21 04:28:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -34,7 +34,7 @@ endif
 
 $(shlib):	$(addprefix $(objdir)/,$(LIBOBJS))
 	@rm -f $(objdir)/$(shlib)
-	cd $(objdir); $(CC) -shared $(LIBOBJS) -o $(shlib) 
+	cd $(objdir); $(CC) $(LDFLAGS) -shared $(LIBOBJS) -o $(shlib) 
 
 CLEANFILES+= $(LIBOBJS) $(lib) $(shlib)
 
diff --git a/src/mk/postgres.prog.mk b/src/mk/postgres.prog.mk
@@ -10,14 +10,14 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.1.1.1.2.1 1996/08/21 04:28:13 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 PROGOBJS:= $(SRCS:%.c=%.o)
 
-$(PROG):  $(addprefix $(objdir)/,$(PROGOBJS))
-	$(CC) $(CDEBUG) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)
+$(PROG):  $(addprefix $(objdir)/,$(PROGOBJS)) $(LIB_DEP)
+	$(CC) $(LDFLAGS) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)
 
 CLEANFILES+= $(PROGOBJS) $(PROG)
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.6 1996/07/25 01:11:15 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.6.2.1 1996/08/21 04:28:02 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -20,7 +20,8 @@ LIBPQ:= -L$(srcdir)/libpq/$(objdir) -lpq`
`20`	`20`
`21`	`21`	`LD_ADD+= $(LIBPQ)`
`22`	`22`	`DPADD+= $(LIBPQ)`
`23`		`-`
	`23`	`+# LIB_DEP is the list of dependencies on libraries for the link.`
	`24`	`+LIB_DEP+= $(srcdir)/libpq/$(objdir)/libpq.a`
`24`	`25`
`25`	`26`	`#`
`26`	`27`	`# And where libpq goes, so goes the authentication stuff...`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`#`
`13`	`13`	`# IDENTIFICATION`
`14`		`-# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $`
	`14`	`+# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.lib.mk,v 1.1.1.1.2.1 1996/08/21 04:28:11 scrappy Exp $`
`15`	`15`	`#`
`16`	`16`	`#-------------------------------------------------------------------------`
`17`	`17`
`@@ -34,7 +34,7 @@ endif`
`34`	`34`
`35`	`35`	`$(shlib): $(addprefix $(objdir)/,$(LIBOBJS))`
`36`	`36`	`@rm -f $(objdir)/$(shlib)`
`37`		`- cd $(objdir); $(CC) -shared $(LIBOBJS) -o $(shlib)`
	`37`	`+ cd $(objdir); $(CC) $(LDFLAGS) -shared $(LIBOBJS) -o $(shlib)`
`38`	`38`
`39`	`39`	`CLEANFILES+= $(LIBOBJS) $(lib) $(shlib)`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@`
`10`	`10`	`#`
`11`	`11`	`#`
`12`	`12`	`# IDENTIFICATION`
`13`		`-# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $`
	`13`	`+# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.1.1.1.2.1 1996/08/21 04:28:13 scrappy Exp $`
`14`	`14`	`#`
`15`	`15`	`#-------------------------------------------------------------------------`
`16`	`16`
`17`	`17`	`PROGOBJS:= $(SRCS:%.c=%.o)`
`18`	`18`
`19`		`-$(PROG): $(addprefix $(objdir)/,$(PROGOBJS))`
`20`		`- $(CC) $(CDEBUG) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)`
	`19`	`+$(PROG): $(addprefix $(objdir)/,$(PROGOBJS)) $(LIB_DEP)`
	`20`	`+ $(CC) $(LDFLAGS) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)`
`21`	`21`
`22`	`22`	`CLEANFILES+= $(PROGOBJS) $(PROG)`
`23`	`23`