From c18bb990d3172b9e11671633975d2505b49aa661 Mon Sep 17 00:00:00 2001 From: Peter Mount Date: Mon, 5 Mar 2001 09:40:02 +0000 Subject: Ok, I've split todays commit into three, the first two already done had some bits in JDBC & the first set of tools into contrib. This is the third, and deals with enabling JDBC to be compiled with the main source. What it does is add a new option to configure: --with-java This option tells configure to look for ant (our build tool of choice) and if found, it then compiles both the JDBC driver and the new tools as part of the normal make. Also, when the postgresql install is done, all the .jar files are also installed into the ${PGLIB}/java directory (thought best to keep then separate) Now I had some conflicts when this applied so could someone please double check that everything is ok? Peter --- src/interfaces/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/interfaces/Makefile') diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile index ee9fed3851..348d15b1a4 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.43 2000/09/25 22:23:00 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.44 2001/03/05 09:39:52 peter Exp $ # #------------------------------------------------------------------------- @@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global DIRS := libpq ecpg libpgeasy -ALLDIRS := $(DIRS) odbc libpq++ libpgtcl perl5 python +ALLDIRS := $(DIRS) odbc libpq++ libpgtcl perl5 python jdbc ifeq ($(enable_odbc), yes) DIRS += odbc @@ -36,6 +36,10 @@ ifeq ($(with_python), yes) DIRS += python endif +ifeq ($(with_java), yes) +DIRS += jdbc +endif + all install installdirs uninstall dep depend distprep: @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done -- cgit v1.2.1