rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Marc G. Fournier 1996-08-21 04:28:13 +00:00
parent 22af16a572
commit b2692ecaa9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/Makefile.global
View File

@ -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...

4
src/mk/postgres.lib.mk
View File

@ -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)

6
src/mk/postgres.prog.mk
View File

@ -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)