diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-01-19 21:20:06 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-01-19 21:20:06 +0000 |
| commit | bd046b99f03811f992571c47c47f2cecfe38df0c (patch) | |
| tree | 02e42477545d0508272a1d25376bcf4d1d609cd0 /src | |
| parent | 163edee6323bfc4abab09fbe20786d6a5dc970f8 (diff) | |
| download | postgresql-bd046b99f03811f992571c47c47f2cecfe38df0c.tar.gz postgresql-bd046b99f03811f992571c47c47f2cecfe38df0c.zip | |
Remove JDBC from the build system and documentation, too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 5 | ||||
| -rw-r--r-- | src/interfaces/Makefile | 8 | ||||
| -rw-r--r-- | src/makefiles/Makefile.cygwin | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 68c3bf80788..f3a1d391820 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.172 2003/12/19 23:29:15 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.173 2004/01/19 21:20:06 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -111,7 +111,6 @@ override docdir := $(docdir)/postgresql endif endif -javadir := $(DESTDIR)$(datadir)/java localedir := @localedir@ @@ -121,7 +120,6 @@ localedir := @localedir@ # # Records the choice of the various --enable-xxx and --with-xxx options. -with_java = @with_java@ with_perl = @with_perl@ with_python = @with_python@ with_tcl = @with_tcl@ @@ -209,7 +207,6 @@ perl_embed_ldflags = @perl_embed_ldflags@ # Miscellaneous -ANT = @ANT@ AWK = @AWK@ LN_S = @LN_S@ MSGFMT = @MSGFMT@ diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile index 052d66dd143..1fa91d5375d 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.51 2003/11/29 19:52:08 pgsql Exp $ +# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.52 2004/01/19 21:20:06 tgl Exp $ # #------------------------------------------------------------------------- @@ -14,16 +14,12 @@ include $(top_builddir)/src/Makefile.global DIRS := libpq ecpg -ALLDIRS := $(DIRS) libpgtcl jdbc +ALLDIRS := $(DIRS) libpgtcl ifeq ($(with_tcl), yes) DIRS += libpgtcl 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 diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index 04493132767..b3ee00c09e7 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.3 2003/11/29 19:52:12 pgsql Exp $ +# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.4 2004/01/19 21:20:06 tgl Exp $ DLLTOOL= dlltool DLLWRAP= dllwrap BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres @@ -32,6 +32,4 @@ ifneq (,$(findstring src/pl/plpython,$(subdir))) override CPPFLAGS+= -DUSE_DL_IMPORT endif -override javadir := '$(shell cygpath -w $(javadir))' - sqlmansect = 7 |