diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/lib/Makefile.in | 8 | ||||
| -rw-r--r-- | src/interfaces/jdbc/Makefile | 10 | ||||
| -rw-r--r-- | src/interfaces/libpgeasy/Makefile.in | 6 | ||||
| -rw-r--r-- | src/interfaces/libpgtcl/Makefile.in | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq++/Makefile.in | 6 |
5 files changed, 16 insertions, 18 deletions
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index a462030ff5b..de846dd7f9c 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -6,18 +6,18 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.62 2000/03/07 15:10:52 meskes Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.63 2000/03/08 01:58:24 momjian Exp $ # #------------------------------------------------------------------------- NAME= ecpg SO_MAJOR_VERSION= 3 -SO_MINOR_VERSION= 1.0 +SO_MINOR_VERSION= 1 SRCDIR= @top_srcdir@ include $(SRCDIR)/Makefile.global -CFLAGS+= -I../include -I$(SRCDIR)/interfaces/libpq +CFLAGS+= -I../include -I$(LIBPQDIR) ifdef KRBVERS CFLAGS+= $(KRBFLAGS) @@ -26,7 +26,7 @@ endif OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ connect.o misc.o -SHLIB_LINK= -L../../libpq -lpq +SHLIB_LINK= $(LIBPQ) # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile index faf22386a23..95789f765f3 100644 --- a/src/interfaces/jdbc/Makefile +++ b/src/interfaces/jdbc/Makefile @@ -4,7 +4,7 @@ # Makefile for Java JDBC interface # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.16 1999/09/15 21:56:16 peter Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.17 2000/03/08 01:58:25 momjian Exp $ # #------------------------------------------------------------------------- @@ -34,11 +34,11 @@ all: @echo @echo If you are using JDK1.1.x, you will need the JDBC1.2 driver. @echo To compile, type: - @echo " make jdbc1" + @echo " $(MAKE) jdbc1" @echo @echo "If you are using JDK1.2 (aka Java2) you need the JDBC2." @echo To compile, type: - @echo " make jdbc2" + @echo " $(MAKE) jdbc2" @echo ------------------------------------------------------------ msg: @@ -59,10 +59,10 @@ msg: @echo @echo ------------------------------------------------------------ @echo To build the examples, type: - @echo " make examples" + @echo " $(MAKE) examples" @echo @echo "To build the CORBA example (requires Java2):" - @echo " make corba" + @echo " $(MAKE) corba" @echo ------------------------------------------------------------ @echo diff --git a/src/interfaces/libpgeasy/Makefile.in b/src/interfaces/libpgeasy/Makefile.in index 46adbd683de..b7e0a52eb7b 100644 --- a/src/interfaces/libpgeasy/Makefile.in +++ b/src/interfaces/libpgeasy/Makefile.in @@ -4,7 +4,7 @@ # Makefile for pgeasy library # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.5 2000/01/10 15:41:28 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.6 2000/03/08 01:58:33 momjian Exp $ # #------------------------------------------------------------------------- @@ -23,9 +23,7 @@ endif OBJS= libpgeasy.o halt.o -SHLIB_LINK+= -L../libpq -lpq - -SHLIB_LINK+= -L../libpq -lpq +SHLIB_LINK+= $(LIBPQ) # 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 diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index 3b5f15b85a1..fa766ff5f0b 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.38 2000/01/10 15:41:29 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.39 2000/03/08 01:58:36 momjian Exp $ # #------------------------------------------------------------------------- @@ -27,7 +27,7 @@ endif OBJS= pgtcl.o pgtclCmds.o pgtclId.o -SHLIB_LINK+= -L../libpq -lpq +SHLIB_LINK+= $(LIBPQ) # 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 diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in index b6f57dc8cf3..d8512543120 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.20 2000/01/10 15:41:31 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.21 2000/03/08 01:58:37 momjian Exp $ # #------------------------------------------------------------------------- @@ -43,9 +43,9 @@ endif OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o ifeq ($(PORTNAME), win) -SHLIB_LINK+= --driver-name g++ -L../libpq -lpq +SHLIB_LINK+= --driver-name g++ $(LIBPQ) else -SHLIB_LINK= -L../libpq -lpq +SHLIB_LINK= $(LIBPQ) endif # For CC on IRIX, must use CC as linker/archiver of C++ libraries |