diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpgtcl/Makefile.in | 9 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile.in | 6 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/Makefile.in | 11 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index a70245f9880..e58b4719ae5 100644 --- a/src/interfaces/libpgtcl/Makefile.in +++ b/src/interfaces/libpgtcl/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.33 1998/10/19 00:00:41 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.34 1999/02/07 22:10:45 tgl Exp $ # #------------------------------------------------------------------------- @@ -27,7 +27,12 @@ endif OBJS= pgtcl.o pgtclCmds.o pgtclId.o -SHLIB_LINK= -L../libpq -lpq +SHLIB_LINK+= -L../libpq -lpq + +# If crypt is a separate library, rather than part of libc, it may need +# to be referenced separately to keep (broken) linkers happy. (This is +# braindead; users of libpq should not need to know what it depends on.) +SHLIB_LINK+= $(findstring -lcrypt,$(LIBS)) # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index b5ad798affc..76437d5f598 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.43 1999/02/02 18:51:29 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.44 1999/02/07 22:10:46 tgl Exp $ # #------------------------------------------------------------------------- @@ -36,11 +36,7 @@ endif # If crypt is a separate library, rather than part of libc, # make sure it gets included in shared libpq. -ifeq ($(PORTNAME), win) SHLIB_LINK+= $(findstring -lcrypt,$(LIBS)) -else -SHLIB_LINK= $(findstring -lcrypt,$(LIBS)) -endif # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in index 7b3379d5520..a38f5093a27 100644 --- a/src/pl/plpgsql/src/Makefile.in +++ b/src/pl/plpgsql/src/Makefile.in @@ -4,7 +4,7 @@ # Makefile for the plpgsql shared object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.13 1999/01/17 06:19:53 momjian Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.14 1999/02/07 22:10:47 tgl Exp $ # #------------------------------------------------------------------------- @@ -24,11 +24,12 @@ LFLAGS+= -i -l OBJS= pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o -ifeq ($(PORTNAME), win) SHLIB_LINK+= -L$(LIBPQDIR) -lpq -else -SHLIB_LINK= -L$(LIBPQDIR) -lpq -endif + +# If crypt is a separate library, rather than part of libc, it may need +# to be referenced separately to keep (broken) linkers happy. (This is +# braindead; users of libpq should not need to know what it depends on.) +SHLIB_LINK+= $(findstring -lcrypt,$(LIBS)) # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib |