diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-08-21 04:28:13 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-08-21 04:28:13 +0000 |
| commit | b2692ecaa94b10ed426fc41857772e78257dac31 (patch) | |
| tree | 4fbe5a2b9cacccac306dca04efd7b3efbb1574a4 /src | |
| parent | 22af16a57219886795066ce7bd7d95bbb1c1fa66 (diff) | |
Here is a patch for Versions 1 and 2 that corrects the following makefile
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/Makefile.global | 5 | ||||
| -rw-r--r-- | src/mk/postgres.lib.mk | 4 | ||||
| -rw-r--r-- | src/mk/postgres.prog.mk | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global index 502732d6feb..d668ad2d781 100644 --- 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 index dc42abb8ff4..3a1720abf77 100644 --- 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 index b45f4783c3e..113726bfe80 100644 --- 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) |