From e9ca59fdbc35d73c3867f0f804949ba4e93faa08 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Wed, 14 Jun 2000 17:07:31 +0000 Subject: [PATCH] Back out libpgtcl tcl/tksh includes. --- configure.in | 2 -- src/interfaces/libpgtcl/Makefile.in | 11 +---------- .../libpgtcl/mkMakefile.tcldefs.sh.in | 16 ---------------- .../libpgtcl/mkMakefile.tkdefs.sh.in | 18 ------------------ 4 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/interfaces/libpgtcl/mkMakefile.tcldefs.sh.in delete mode 100644 src/interfaces/libpgtcl/mkMakefile.tkdefs.sh.in diff --git a/configure.in b/configure.in index 42930ab94bf..8cbc7af340f 100644 --- a/configure.in +++ b/configure.in @@ -1207,8 +1207,6 @@ AC_OUTPUT( src/interfaces/libpq++/Makefile src/interfaces/libpgeasy/Makefile src/interfaces/libpgtcl/Makefile - src/interfaces/libpgtcl/mkMakefile.tcldefs.sh - src/interfaces/libpgtcl/mkMakefile.tkdefs.sh src/interfaces/odbc/GNUmakefile src/interfaces/odbc/Makefile.global src/interfaces/python/GNUmakefile diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index d722e28b5e5..2b25f222196 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.42 2000/06/13 09:16:39 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.43 2000/06/14 17:07:31 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,14 +19,6 @@ include $(SRCDIR)/Makefile.global CFLAGS+= -I$(LIBPQDIR) -# -# Include definitions from the tclConfig.sh file -# -include Makefile.tcldefs -ifeq ($(USE_TK), true) -include Makefile.tkdefs -endif - ifdef KRBVERS CFLAGS+= $(KRBFLAGS) endif @@ -43,7 +35,6 @@ SHLIB_LINK+= $(findstring -lcrypt,$(LIBS)) # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib - .PHONY: install beforeinstall-headers install-headers install: install-headers install-lib $(install-shlib-dep) diff --git a/src/interfaces/libpgtcl/mkMakefile.tcldefs.sh.in b/src/interfaces/libpgtcl/mkMakefile.tcldefs.sh.in deleted file mode 100644 index a8c2cc374de..00000000000 --- a/src/interfaces/libpgtcl/mkMakefile.tcldefs.sh.in +++ /dev/null @@ -1,16 +0,0 @@ - -if [ ! -f @TCL_CONFIG_SH@ ]; then - echo "@TCL_CONFIG_SH@ not found" - echo "I need this file! Please make a symbolic link to this file" - echo "and start make again." - exit 1 -fi - -cat @TCL_CONFIG_SH@ | - egrep '^TCL_' | - while read inp - do - eval eval echo $inp - done >Makefile.tcldefs - -exit 0 diff --git a/src/interfaces/libpgtcl/mkMakefile.tkdefs.sh.in b/src/interfaces/libpgtcl/mkMakefile.tkdefs.sh.in deleted file mode 100644 index 3b5fd2402f4..00000000000 --- a/src/interfaces/libpgtcl/mkMakefile.tkdefs.sh.in +++ /dev/null @@ -1,18 +0,0 @@ - -if [ ! -f @TK_CONFIG_SH@ ]; then - echo "@TK_CONFIG_SH@ not found" - echo "I need this file! Please make a symbolic link to this file" - echo "and start make again." - exit 1 -fi - -. @TK_CONFIG_SH@ - -cat @TK_CONFIG_SH@ | - egrep '^TK_' | - while read inp - do - eval eval echo $inp - done >Makefile.tkdefs - -exit 0 -- GitLab