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

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 

diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global
index 502732d6febd16c7e15fc367ade0350c3f6add7c..25277f6b913567716965321a99559bf8503d3b35 100644 (file)
--- 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
index 52cfbea1b25456ed4cab29ddb49fcfbca93fe732..d8d1757f0f35f1472dd1e3938f9bc6f9ef064c3b 100644 (file)
--- 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)