Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6b9ecd8

Browse files
committed
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 <bryanh@giraffe.netgate.net>
1 parent 80d0c4f commit 6b9ecd8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/bin/Makefile.global

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# 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 $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,7 +20,8 @@ LIBPQ:= -L$(srcdir)/libpq/$(objdir) -lpq
2020

2121
LD_ADD+= $(LIBPQ)
2222
DPADD+= $(LIBPQ)
23-
23+
# LIB_DEP is the list of dependencies on libraries for the link.
24+
LIB_DEP+= $(srcdir)/libpq/$(objdir)/libpq.a
2425

2526
#
2627
# And where libpq goes, so goes the authentication stuff...
@@ -29,3 +30,4 @@ ifdef KRBVERS
2930
LD_ADD+= $(KRBLIBS)
3031
CFLAGS+= $(KRBFLAGS)
3132
endif
33+

src/mk/postgres.prog.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#
1111
#
1212
# 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 $
1414
#
1515
#-------------------------------------------------------------------------
1616

1717
PROGOBJS:= $(SRCS:%.c=%.o)
1818

19-
$(PROG): $(addprefix $(objdir)/,$(PROGOBJS))
19+
$(PROG): $(addprefix $(objdir)/,$(PROGOBJS)) $(LIB_DEP)
2020
$(CC) $(LDFLAGS) -o $(objdir)/$(@F) $(addprefix $(objdir)/,$(PROGOBJS)) $(LD_ADD)
2121

2222
CLEANFILES+= $(PROGOBJS) $(PROG)

0 commit comments

Comments
 (0)