Here's a small makefile patch that corrects the following bug: The makefiles

scrappy · scrappy · commit 6b9ecd83484e · 1996-08-14T04:54:45.000Z
don't indicate that the libpq.a library is a dependency of all the /bin
programs.  So if the library changes, the /bin programs don't get remade.

Submitted by: Bryan Henderson &lt;bryanh@giraffe.netgate.net&gt;
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.7 1996/08/14 04:54:24 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...
@@ -29,3 +30,4 @@ ifdef KRBVERS
 LD_ADD+= $(KRBLIBS)
 CFLAGS+= $(KRBFLAGS)
 endif
+
diff --git a/src/mk/postgres.prog.mk b/src/mk/postgres.prog.mk
@@ -10,13 +10,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.2 1996/08/13 07:48:33 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.3 1996/08/14 04:54:45 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 PROGOBJS:= $(SRCS:%.c=%.o)
 
-$(PROG):  $(addprefix $(objdir)/,$(PROGOBJS))
+$(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.7 1996/08/14 04:54:24 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...`
`@@ -29,3 +30,4 @@ ifdef KRBVERS`
`29`	`30`	`LD_ADD+= $(KRBLIBS)`
`30`	`31`	`CFLAGS+= $(KRBFLAGS)`
`31`	`32`	`endif`
	`33`	`+`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@`
`10`	`10`	`#`
`11`	`11`	`#`
`12`	`12`	`# IDENTIFICATION`
`13`		`-# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.2 1996/08/13 07:48:33 scrappy Exp $`
	`13`	`+# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.prog.mk,v 1.3 1996/08/14 04:54:45 scrappy Exp $`
`14`	`14`	`#`
`15`	`15`	`#-------------------------------------------------------------------------`
`16`	`16`
`17`	`17`	`PROGOBJS:= $(SRCS:%.c=%.o)`
`18`	`18`
`19`		`-$(PROG): $(addprefix $(objdir)/,$(PROGOBJS))`
	`19`	`+$(PROG): $(addprefix $(objdir)/,$(PROGOBJS)) $(LIB_DEP)`
`20`	`20`	`$(CC) $(LDFLAGS) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)`
`21`	`21`
`22`	`22`	`CLEANFILES+= $(PROGOBJS) $(PROG)`