head	1.44;
access;
symbols
	REL7_4_29:1.41.4.1
	REL7_4_28:1.41.4.1
	REL7_4_27:1.41.4.1
	REL7_4_26:1.41.4.1
	REL7_4_25:1.41.4.1
	REL7_4_24:1.41.4.1
	REL7_4_23:1.41.4.1
	REL7_4_22:1.41.4.1
	REL7_4_21:1.41.4.1
	REL7_4_20:1.41.4.1
	REL7_3_21:1.39
	REL7_4_19:1.41.4.1
	REL7_3_20:1.39
	REL7_4_18:1.41.4.1
	REL7_3_19:1.39
	REL7_4_17:1.41.4.1
	REL7_3_18:1.39
	REL7_4_16:1.41.4.1
	REL7_4_15:1.41.4.1
	REL7_3_17:1.39
	REL7_4_14:1.41.4.1
	REL7_3_16:1.39
	REL7_3_15:1.39
	REL7_4_13:1.41.4.1
	REL7_3_14:1.39
	REL7_4_12:1.41.4.1
	REL7_3_13:1.39
	REL7_4_11:1.41.4.1
	REL7_3_12:1.39
	REL7_4_10:1.41.4.1
	REL7_3_11:1.39
	REL7_4_9:1.41.4.1
	REL7_2_8:1.37
	REL7_3_10:1.39
	REL7_4_8:1.41.4.1
	REL7_2_7:1.37
	REL7_3_9:1.39
	REL7_4_7:1.41.4.1
	REL7_4_6:1.41.4.1
	REL7_3_8:1.39
	REL7_2_6:1.37
	REL7_2_5:1.37
	REL7_4_5:1.41.4.1
	REL7_3_7:1.39
	REL7_4_4:1.41.4.1
	REL7_4_3:1.41.4.1
	REL7_4_2:1.41.4.1
	REL7_3_6:1.39
	REL7_4_1:1.41.4.1
	REL7_3_5:1.39
	REL7_4:1.41
	REL7_4_RC2:1.41
	REL7_4_STABLE:1.41.0.4
	REL7_4_RC1:1.41
	REL7_4_BETA5:1.41
	REL7_4_BETA4:1.41
	REL7_4_BETA3:1.41
	REL7_4_BETA2:1.41
	WIN32_DEV:1.41.0.2
	REL7_4_BETA1:1.41
	REL7_3_4:1.39
	REL7_3_2:1.39
	REL7_2_4:1.37
	REL7_3_STABLE:1.39.0.2
	REL7_2_3:1.37
	REL7_2_STABLE:1.37.0.4
	REL7_2:1.37
	REL7_2_RC2:1.37
	REL7_2_RC1:1.37
	REL7_2_BETA5:1.37
	REL7_2_BETA4:1.37
	REL7_2_BETA3:1.37
	REL7_2_BETA2:1.37
	REL7_2_BETA1:1.37
	REL7_1_2:1.37
	REL7_1_STABLE:1.37.0.2
	REL7_1_BETA:1.35
	REL7_1_BETA3:1.35
	REL7_1_BETA2:1.35
	REL7_1:1.37
	REL7_0_PATCHES:1.25.0.2
	REL7_0:1.25
	REL6_5_PATCHES:1.24.0.4
	REL6_5:1.24
	REL6_4:1.24.0.2
	release-6-3:1.11
	REL2_0B:1.4.0.2
	REL2_0:1.4
	Release_2_0_0:1.2
	Release_1_0_3:1.2.0.2
	Release_2_0:1.2
	Release_1_0_2:1.2
	PG95-1_01:1.1.1.1
	PG95_DIST:1.1.1;
locks; strict;
comment	@# @;


1.44
date	2004.04.20.00.33.50;	author pgsql;	state dead;
branches;
next	1.43;

1.43
date	2003.12.19.11.54.25;	author petere;	state Exp;
branches;
next	1.42;

1.42
date	2003.11.29.19.52.06;	author pgsql;	state Exp;
branches;
next	1.41;

1.41
date	2003.08.01.19.01.49;	author tgl;	state Exp;
branches
	1.41.4.1;
next	1.40;

1.40
date	2002.12.30.17.19.51;	author tgl;	state Exp;
branches;
next	1.39;

1.39
date	2002.06.20.20.29.42;	author momjian;	state Exp;
branches;
next	1.38;

1.38
date	2002.05.24.18.10.17;	author petere;	state Exp;
branches;
next	1.37;

1.37
date	2001.02.20.19.20.29;	author petere;	state Exp;
branches;
next	1.36;

1.36
date	2001.02.18.18.34.01;	author momjian;	state Exp;
branches;
next	1.35;

1.35
date	2000.11.30.20.36.12;	author petere;	state Exp;
branches;
next	1.34;

1.34
date	2000.10.20.21.04.00;	author petere;	state Exp;
branches;
next	1.33;

1.33
date	2000.09.25.22.22.58;	author petere;	state Exp;
branches;
next	1.32;

1.32
date	2000.09.17.13.02.42;	author petere;	state Exp;
branches;
next	1.31;

1.31
date	2000.08.31.16.11.21;	author petere;	state Exp;
branches;
next	1.30;

1.30
date	2000.07.01.15.02.23;	author petere;	state Exp;
branches;
next	1.29;

1.29
date	2000.06.30.16.10.47;	author petere;	state Exp;
branches;
next	1.28;

1.28
date	2000.06.27.00.31.40;	author petere;	state Exp;
branches;
next	1.27;

1.27
date	2000.06.17.00.09.47;	author petere;	state Exp;
branches;
next	1.26;

1.26
date	2000.06.12.02.23.47;	author momjian;	state Exp;
branches;
next	1.25;

1.25
date	2000.03.08.01.58.21;	author momjian;	state Exp;
branches
	1.25.2.1;
next	1.24;

1.24
date	98.10.27.21.51.54;	author tgl;	state Exp;
branches;
next	1.23;

1.23
date	98.10.18.04.16.08;	author momjian;	state Exp;
branches;
next	1.22;

1.22
date	98.10.15.15.58.15;	author momjian;	state Exp;
branches;
next	1.21;

1.21
date	98.10.13.16.30.48;	author momjian;	state Exp;
branches;
next	1.20;

1.20
date	98.10.12.04.32.22;	author momjian;	state Exp;
branches;
next	1.19;

1.19
date	98.10.12.02.40.58;	author momjian;	state Exp;
branches;
next	1.18;

1.18
date	98.05.12.15.42.08;	author momjian;	state Exp;
branches;
next	1.17;

1.17
date	98.04.06.16.51.35;	author momjian;	state Exp;
branches;
next	1.16;

1.16
date	98.04.06.01.15.51;	author momjian;	state Exp;
branches;
next	1.15;

1.15
date	98.04.06.00.29.46;	author momjian;	state Exp;
branches;
next	1.14;

1.14
date	98.04.05.22.01.35;	author momjian;	state Exp;
branches;
next	1.13;

1.13
date	98.03.23.06.02.39;	author momjian;	state Exp;
branches;
next	1.12;

1.12
date	98.03.23.04.08.05;	author momjian;	state Exp;
branches;
next	1.11;

1.11
date	98.02.22.20.02.28;	author momjian;	state Exp;
branches;
next	1.10;

1.10
date	98.01.25.04.14.23;	author scrappy;	state Exp;
branches;
next	1.9;

1.9
date	97.09.27.19.28.40;	author momjian;	state Exp;
branches;
next	1.8;

1.8
date	97.09.27.19.13.56;	author momjian;	state Exp;
branches;
next	1.7;

1.7
date	97.04.26.05.06.12;	author scrappy;	state Exp;
branches;
next	1.6;

1.6
date	97.04.04.10.42.11;	author scrappy;	state Exp;
branches;
next	1.5;

1.5
date	97.01.21.05.16.38;	author bryanh;	state Exp;
branches;
next	1.4;

1.4
date	96.11.11.13.41.25;	author bryanh;	state Exp;
branches;
next	1.3;

1.3
date	96.11.04.05.14.34;	author momjian;	state Exp;
branches;
next	1.2;

1.2
date	96.07.23.03.03.36;	author scrappy;	state Exp;
branches;
next	1.1;

1.1
date	96.07.09.06.22.15;	author scrappy;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	96.07.09.06.22.15;	author scrappy;	state Exp;
branches;
next	;

1.25.2.1
date	2000.09.23.22.51.19;	author tgl;	state Exp;
branches;
next	;

1.41.4.1
date	2003.12.19.11.54.23;	author petere;	state Exp;
branches;
next	;


desc
@@


1.44
log
@
Remove all of the libpgtcl and pgtclsh files, including all references to
them within the various makefiles

with_tcl is still required for the src/pl/tcl language
@
text
@#-------------------------------------------------------------------------
#
# Makefile for src/bin/pgtclsh
# (a tclsh workalike with pgtcl commands installed)
#
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $PostgreSQL: pgsql-server/src/bin/pgtclsh/Makefile,v 1.43 2003/12/19 11:54:25 petere Exp $
#
#-------------------------------------------------------------------------

subdir = src/bin/pgtclsh
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global


libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
libpgtcl = -L$(libpgtcl_builddir) -lpgtcl

override CPPFLAGS := -I$(libpgtcl_srcdir) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC) $(CPPFLAGS)


# If we are here then Tcl is available
PROGRAMS = pgtclsh

# Add Tk targets if Tk is available
ifeq ($(with_tk), yes)
PROGRAMS += pgtksh
endif

all: submake $(PROGRAMS)

pgtclsh: pgtclAppInit.o
	$(CC) $(CFLAGS) $^ $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS) $(LIBS) -o $@@

pgtksh: pgtkAppInit.o
	$(CC) $(CFLAGS) $^ $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LDFLAGS) $(LIBS) -o $@@

.PHONY: submake
submake:
	$(MAKE) -C $(libpgtcl_builddir) all

install: all installdirs
	$(INSTALL_PROGRAM) pgtclsh$(X) $(DESTDIR)$(bindir)/pgtclsh$(X)
ifeq ($(with_tk), yes)
	$(INSTALL_PROGRAM) pgtksh$(X) $(DESTDIR)$(bindir)/pgtksh$(X)
endif

installdirs:
	$(mkinstalldirs) $(DESTDIR)$(bindir)

uninstall:
	rm -f $(DESTDIR)$(bindir)/pgtclsh$(X) $(DESTDIR)$(bindir)/pgtksh$(X)

clean distclean maintainer-clean:
	rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh
@


1.43
log
@Add missing $(X).
@
text
@d9 1
a9 1
# $PostgreSQL: pgsql-server/src/bin/pgtclsh/Makefile,v 1.42 2003/11/29 19:52:06 pgsql Exp $
@


1.42
log
@
$Header: -> $PostgreSQL Changes ...
@
text
@d9 1
a9 1
# $PostgreSQL: /cvsroot/pgsql-server/src/bin/pgtclsh/Makefile,v 1.41 2003/08/01 19:01:49 tgl Exp $
d46 1
a46 1
	$(INSTALL_PROGRAM) pgtclsh $(DESTDIR)$(bindir)/pgtclsh
d48 1
a48 1
	$(INSTALL_PROGRAM) pgtksh $(DESTDIR)$(bindir)/pgtksh
d55 1
a55 1
	rm -f $(DESTDIR)$(bindir)/pgtclsh $(DESTDIR)$(bindir)/pgtksh
@


1.41
log
@Get the include ordering right for TCL includes vs whatever is coming
from --with-includes.
@
text
@d9 1
a9 1
# $Header: /cvsroot/pgsql-server/src/bin/pgtclsh/Makefile,v 1.40 2002/12/30 17:19:51 tgl Exp $
@


1.41.4.1
log
@Add missing $(X).
@
text
@d9 1
a9 1
# $Header: /cvsroot/pgsql-server/src/bin/pgtclsh/Makefile,v 1.41 2003/08/01 19:01:49 tgl Exp $
d46 1
a46 1
	$(INSTALL_PROGRAM) pgtclsh$(X) $(DESTDIR)$(bindir)/pgtclsh$(X)
d48 1
a48 1
	$(INSTALL_PROGRAM) pgtksh$(X) $(DESTDIR)$(bindir)/pgtksh$(X)
d55 1
a55 1
	rm -f $(DESTDIR)$(bindir)/pgtclsh$(X) $(DESTDIR)$(bindir)/pgtksh$(X)
@


1.40
log
@Make use of TCL_INCLUDE_SPEC if available (it's new in Tcl 8.4, too bad
it took 'em this long to realize it's needed...)
@
text
@d9 1
a9 1
# $Header: /cvsroot/pgsql-server/src/bin/pgtclsh/Makefile,v 1.39 2002/06/20 20:29:42 momjian Exp $
d22 1
a22 1
override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC)
@


1.39
log
@Update copyright to 2002.
@
text
@d9 1
a9 1
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.38 2002/05/24 18:10:17 petere Exp $
d22 1
a22 1
override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES)
@


1.38
log
@Change PL/Tcl build to use configured compiler and Makefile.shlib
system, not Tcl-provided one.

Make sure export file, if any, is cleaned.

Tcl configuration is now read directly in configure and recorded in
Makefile.global.  This eliminates some duplicate efforts and allows
for easier hand-editing of the results, if necessary.
@
text
@d6 1
a6 1
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
d9 1
a9 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.37 2001/02/20 19:20:29 petere Exp $
@


1.37
log
@Make sure -L and -I's for our source tree are always before system include
or library directories on the command line.
@
text
@d9 1
a9 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.36 2001/02/18 18:34:01 momjian Exp $
a16 7
#
# Include definitions from the tclConfig.sh file
#
-include Makefile.tcldefs
ifeq ($(with_tk), yes)
-include Makefile.tkdefs
endif
a56 6
Makefile.tcldefs: mkMakefile.tcldefs.sh
	$(SHELL) $< '$(TCL_CONFIG_SH)' '$@@'

Makefile.tkdefs: mkMakefile.tkdefs.sh
	$(SHELL) $< '$(TK_CONFIG_SH)' '$@@'

d58 1
a58 4
	rm -f pgtclAppInit.o pgtkAppInit.o Makefile.tcldefs Makefile.tkdefs pgtclsh pgtksh

dep depend:
	$(CC) -MM $(CFLAGS) *.c > depend
@


1.36
log
@Add copyright mentions, per Tom Lane.
@
text
@d9 1
a9 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.35 2000/11/30 20:36:12 petere Exp $
d29 1
a29 1
override CPPFLAGS += -I$(libpgtcl_srcdir) $(TK_XINCLUDES)
d43 1
a43 1
	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LIBS) -o $@@
d46 1
a46 1
	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LIBS) -o $@@
@


1.35
log
@Make all commands that link a program look like

$(CC) $(CFLAGS) $(LDFLAGS) <object files> <extra-libraries> $(LIBS) -o $@@

This form seemed to be the most portable, readable, and logical, but in any
case it's better than having a dozen different ones in the tree.
@
text
@d6 2
a7 1
# Copyright (c) 1994, Regents of the University of California
d9 1
a9 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.34 2000/10/20 21:04:00 petere Exp $
@


1.34
log
@Add support for VPATH builds, that is, building somewhere else than in the
source directory.  This involves mostly makefiles using $(srcdir) when they
might have used ".".  (Regression tests don't work with this, yet.)

Sort out usage of CPPFLAGS, CFLAGS (and CXXFLAGS).  Add "override" keyword
in most places, to preserve necessary flags even when the user overrode the
flags.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.33 2000/09/25 22:22:58 petere Exp $
d42 1
a42 1
	$(CC) $(CFLAGS) -o $@@ $< $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
d45 1
a45 1
	$(CC) $(CFLAGS) -o $@@ $< $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LDFLAGS)
@


1.33
log
@Revise Tcl/Tk configuration.  Make missing Tcl after --with-tcl an error,
add --without-tk option to disable Tk.  We don't need the AC_PATH_XTRA
test because tkConfig.sh already contains all the information about how to
compile and link with X.  Also make sure that libpq is up to date for
libpgtcl.  Remove executable bits from pgaccess.sh, but add it to pgaccess.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.32 2000/09/17 13:02:42 petere Exp $
d28 1
a28 1
CPPFLAGS += -I$(libpgtcl_srcdir) $(TK_XINCLUDES)
@


1.32
log
@Support for DESTDIR make variable. This is used as in `make install
DESTDIR=/else/where' and prepends the value of DESTDIR to the full
installation paths (e.g., /else/where/usr/local/pgsql/bin). This allows
users to install the package into a location different from the one that
was configured and hard-coded into various scripts, e.g., for creating
binary packages.

DESTDIR is in many cases preferrable over `make install
prefix=/else/where' because

a) `prefix' affects the path that is hard-coded into the files, which can
lead to a `make install prefix=xxx' (as done by the regression test
driver) corrupting the files in the source tree with wrong paths.

b) it doesn't work at all if a directory was overridden to not depend on
`prefix', e.g., --sysconfdir=/etc.

(Updating the regression test driver to use DESTDIR is a separate
undertaking.)

See also autoconf@@gnu.org, From: Akim Demaille <akim@@epita.fr>, Date: 08
Sep 2000 12:48:59 +0200, Message-ID:
<mv4em2vb1lw.fsf@@nostromo.lrde.epita.fr>, Subject: Re: HTML format
documentation.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.31 2000/08/31 16:11:21 petere Exp $
d20 1
a20 1
ifeq ($(USE_TK), true)
d28 1
a28 1
CFLAGS+= $(X_CFLAGS) -I$(libpgtcl_srcdir)
d31 1
a31 1
# If we are here then TCL is available
d34 2
a35 2
# Add TK targets if TK is available
ifeq ($(USE_TK), true)
d42 1
a42 2
	$(CC) $(CFLAGS) $(TCL_DEFS) -o $@@ $< \
	  $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
d45 1
a45 3
	$(CC) $(CFLAGS) $(TK_DEFS) -o $@@ $< \
	  $(libpgtcl) $(libpq) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
	  $(TCL_LIB_SPEC) $(X11_LIBS) $(LDFLAGS)
d53 1
a53 1
ifeq ($(USE_TK), true)
d70 1
a70 1
	rm -f *.o Makefile.tcldefs Makefile.tkdefs pgtclsh pgtksh
@


1.31
log
@Fix relative path references so that make knowns which dependencies refer
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.30 2000/07/01 15:02:23 petere Exp $
d55 1
a55 1
	$(INSTALL_PROGRAM) pgtclsh $(bindir)/pgtclsh
d57 1
a57 1
	$(INSTALL_PROGRAM) pgtksh $(bindir)/pgtksh
d61 1
a61 1
	$(mkinstalldirs) $(bindir)
d64 1
a64 1
	rm -f $(bindir)/pgtclsh $(bindir)/pgtksh
@


1.30
log
@A little bit of clean-up/bug fix in Tcl build. Handle gracefully cases
where someone wants to build these but hasn't configured for Tcl.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.29 2000/06/30 16:10:47 petere Exp $
d14 1
a14 1
include ../../Makefile.global
d24 5
a28 1
CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR)
d43 1
a43 1
	  $(LIBPGTCL) $(LIBPQ) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
d47 1
a47 1
	  $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
d52 1
a52 1
	$(MAKE) -C $(LIBPGTCLDIR) all
@


1.29
log
@Fixes for Solaris/cc suggested by <pgsql-hackers@@thewrittenword.com>

Don't use DISABLE_COMPLEX_MACRO on Solaris. Don't define the
replacement function in the header file. Use -KPIC, not -K PIC.
Use CC to link C++ libraries, not ld/ar.

Eliminate file not found warnings in tcl build code.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.28 2000/06/27 00:31:40 petere Exp $
d63 1
a63 1
	$(SHELL) $<
d66 1
a66 1
	$(SHELL) $<
d68 1
a68 5
mkMakefile.tcldefs.sh mkMakefile.tkdefs.sh: $(top_builddir)/config.status
mkMakefile.tcldefs.sh mkMakefile.tkdefs.sh: % : %.in
	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@@ CONFIG_HEADERS= ./config.status

clean:
a69 3

distclean maintainer-clean: clean
	rm -f mkMakefile.tcldefs.sh mkMakefile.tkdefs.sh
@


1.28
log
@Makefile cleanup for bin and pl subtrees. They should now support
all the standard semantics. Also get rid of Makefile.in's on the
way and instead declare all variables in Makefile.global.
@
text
@d8 1
a8 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.27 2000/06/17 00:09:47 petere Exp $
d19 1
a19 1
include Makefile.tcldefs
d21 1
a21 1
include Makefile.tkdefs
@


1.27
log
@Remove fmgrstamp-h business -- not needed and confusing

Add options to configure to automatically build for Kerberos
support; no more editing of make files.
@
text
@d3 2
a4 2
# Makefile
#    Makefile for a tclsh workalike with pgtcl commands installed
d8 1
a8 3
#
# IDENTIFICATION
#    $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.26 2000/06/12 02:23:47 momjian Exp $
d12 2
a13 1
SRCDIR= ../..
d28 1
a28 2
PGMS = pgtclsh
INSTPGMS = install_tcl
d32 1
a32 2
PGMS += pgtksh
INSTPGMS += install_tk
d35 1
a35 1
all: $(PGMS)
d38 1
a38 1
	$(CC) $(CFLAGS) $(TCL_DEFS) -o $@@ pgtclAppInit.o \
d42 1
a42 1
	$(CC) $(CFLAGS) $(TK_DEFS) -o $@@ pgtkAppInit.o \
d46 9
a54 1
install: $(INSTPGMS)
d56 2
a57 2
install_tcl: pgtclsh
	$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
d59 2
a60 2
install_tk: pgtksh
	$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
d63 1
a63 1
	/bin/sh ./mkMakefile.tcldefs.sh
d66 5
a70 1
	/bin/sh ./mkMakefile.tkdefs.sh
d73 4
a76 1
	rm -f *.o Makefile.t*defs pgtclsh pgtksh
@


1.26
log
@>> What happened to the patch I sent regarding the bug in the TCL
>> Makefile where the make bombs if "." is not in the builder's path?
>> The last I checked, it wasn't applied and the fix is very easy
>> (explicitly use "./" to call the script).

 SL Baur
@
text
@d10 1
a10 1
#    $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.25 2000/03/08 01:58:21 momjian Exp $
a26 4
ifdef KRBVERS
LDFLAGS+= $(KRBLIBS)
CFLAGS+= $(KRBFLAGS)
endif
@


1.25
log
@I've made a diff against the 7.0beta1 tree that accomplishes several things:

        1) adds NetBSD shared lib support on both ELF and a.out platforms

        2) replaces "-L$(LIBPQDIR) -lpq" with "$(LIBPQ)" defined in
           Makefile.global.  This makes it much easier to build stuff in
           the source tree after you've already installed the libraries.

        3) adds TEMPLATEDIR in Makefile.global that indicates where the
           database templates are stored.  This separates the template files
           from real libraries that are installed in $(LIBDIR).
        4) changes include order of <readline/readline.h> and <readline.h>.
           The latest GNU readline installs its headers under a readline
           subdirectory.

In addition to applying the patch below the following files need to be copied:

        backend/port/dynloader:
                bsd.h -> netbsd.h
                bsd.c -> netbsd.c
        include/port:
                bsd.h -> netbsd.h
        makefiles:
                Makefile.bsd -> Makefile.netbsd

It would be great to see this incorporated into the source tree before
the 7.0 release is cut.

        Thanks!

     -- Johnny C. Lam <lamj@@stat.cmu.edu>
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.24 1998/10/27 21:51:54 tgl Exp $
d62 1
a62 1
	/bin/sh mkMakefile.tcldefs.sh
d65 1
a65 1
	/bin/sh mkMakefile.tkdefs.sh
@


1.25.2.1
log
@Back-patch fix for '.' not in PATH at build time, per SL Baur.
@
text
@d10 1
a10 1
#    $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.25 2000/03/08 01:58:21 momjian Exp $
d62 1
a62 1
	/bin/sh ./mkMakefile.tcldefs.sh
d65 1
a65 1
	/bin/sh ./mkMakefile.tkdefs.sh
@


1.24
log
@Fix missing dependency for Makefile inclusions.
Get rid of some stray tabs that might confuse Make.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.23 1998/10/18 04:16:08 momjian Exp $
d25 1
a25 1
CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl 
a30 3

LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
LIBPQ= -L$(LIBPQDIR) -lpq
@


1.23
log
@The TCL/TK configuration cleanup patches I submitted have the following
problem:

    'tclsh' still had to be found even if --with-libs (or
--with-libraries) was
    specified to configure.

    --with-libs is really an overloaded option.  It really should only be used
    to specify additions directories to search in order to file needed
    libraries.  It was also being used to locate the *Config.sh files.

Billy G. Allie
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.22 1998/10/15 15:58:15 momjian Exp $
d22 1
a22 1
	include Makefile.tkdefs
a31 1
# try to find libpgtcl.a in either directory
d41 2
a42 2
	PGMS += pgtksh
	INSTPGMS += install_tk
a46 6
Makefile.tcldefs:
	/bin/sh mkMakefile.tcldefs.sh

Makefile.tkdefs:
	/bin/sh mkMakefile.tkdefs.sh

d63 6
@


1.22
log
@TCL/TK fixes from Billy G. Allie.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.21 1998/10/13 16:30:48 momjian Exp $
d72 1
a72 1
	rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh
@


1.21
log
@Remove TCL_LIB,TCL_INCDIR,TK_LIB,TK_INCDIR.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.20 1998/10/12 04:32:22 momjian Exp $
d20 4
a23 1
include Makefile.tcltkdefs
d36 11
a46 1
all: pgtclsh pgtksh
d48 5
a52 2
Makefile.tcltkdefs:
	/bin/sh mkMakefile.tcltkdefs.sh
d63 3
a65 1
install: pgtclsh pgtksh
d67 2
@


1.20
log
@tcl cleanup.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.19 1998/10/12 02:40:58 momjian Exp $
d45 1
a45 1
	  $(TCL_LIB_SPEC) $(TCL_LIB) $(X11_LIBS) $(LDFLAGS)
@


1.19
log
@Tcl fixes from Billy G. Allie
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.18 1998/05/12 15:42:08 momjian Exp $
d22 1
a22 1
CFLAGS+=  -I$(SRCDIR)/interfaces/libpgtcl 
d44 2
a45 2
	  $(LIBPGTCL) $(LIBPQ) $(TK_LIB_SPEC) $(TK_LIBS) \
	  $(TCL_LIB_SPEC) $(TCL_LIB) $(LDFLAGS)
@


1.18
log
@Add sys/time.h to fe-misc.c, prevent pgtclsh from using old libaries,
and allow CUSTOM_COPT to appear in compile AND LINK commands.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.17 1998/04/06 16:51:35 momjian Exp $
d17 6
a22 1
CFLAGS+=  $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl
d35 3
d39 2
a40 2
	$(CC) $(CFLAGS) -o $@@ pgtclAppInit.o \
	  $(LIBPGTCL) $(LIBPQ) $(TCL_LIB) -lm $(LDFLAGS)
d43 3
a45 3
	$(CC) $(CFLAGS) -o $@@ pgtkAppInit.o \
	  $(LIBPGTCL) $(LIBPQ) $(X_LIBS) $(TK_LIB) $(TCL_LIB) \
	  $(X11_LIBS) -lm $(LDFLAGS)
@


1.17
log
@DESTDIR removed, again.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.16 1998/04/06 01:15:51 momjian Exp $
d25 2
a26 2
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -L$(LIBDIR) -lpgtcl
LIBPQ= -L$(LIBPQDIR) -L$(LIBDIR) -lpq
@


1.16
log
@Re-introduce $DISTDIR.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.15 1998/04/06 00:29:46 momjian Exp $
d40 2
a41 2
	$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
	$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
@


1.15
log
@Hi,

Attached you'll find a (big) patch that fixes make dep and make
depend in all Makefiles where I found it to be appropriate.

It also removes the dependency in Makefile.global for NAMEDATALEN
and OIDNAMELEN by making backend/catalog/genbki.sh and bin/initdb/initdb.sh
a little smarter.

This no longer requires initdb.sh that is turned into initdb with
a sed script when installing Postgres, hence initdb.sh should be
renamed to initdb (after the patch has been applied :-) )

This patch is against the 6.3 sources, as it took a while to
complete.

Please review and apply,

Cheers,

Jeroen van Vianen
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.14 1998/04/05 22:01:35 momjian Exp $
d40 2
a41 2
	$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
	$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
@


1.14
log
@Remove DISTDIR.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.13 1998/03/23 06:02:39 momjian Exp $
d45 3
@


1.13
log
@more tcl/tk fixes
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.12 1998/03/23 04:08:05 momjian Exp $
d40 2
a41 2
	$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
	$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
@


1.12
log
@Another tcl/tk fix.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.11 1998/02/22 20:02:28 momjian Exp $
d17 1
a17 1
CFLAGS+=  $(X_CFLAGS) -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
@


1.11
log
@Configure patches from Brook Milligan.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.10 1998/01/25 04:14:23 scrappy Exp $
d32 1
a32 1
	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LDFLAGS)
d36 2
a37 2
	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) $(X_LIBS) \
	  $(TK_LIB) $(TCL_LIB) $(X11_LIBS) -lm $(LDFLAGS)
@


1.10
log
@From: Tom I Helbekkmo <tih@@Hamartun.Priv.NO>

Hi -- a couple of small items concerning the January 23rd snapshot:
the inclusion of the Kerberos stuff in one Makefile, a "leading tab"
cleanup in another, and a fix for a typo in the configure script.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.9 1997/09/27 19:28:40 momjian Exp $
d17 1
a17 1
CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/interfaces/libpgtcl
d36 2
a37 2
	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR) \
	  $(TK_LIB) $(TCL_LIB) -lX11 -lm $(LDFLAGS)
@


1.9
log
@Changed location of libpgtcl stuff.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.8 1997/09/27 19:13:56 momjian Exp $
d18 5
@


1.8
log
@Changed location of libpgtcl stuff.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/pgsql/src/bin/pgtclsh/Makefile,v 1.7 1997/04/26 05:06:12 scrappy Exp $
d20 1
a20 1
LIBPGTCL= -L$(SRCDIR)/libpgtcl -L$(LIBDIR) -lpgtcl
@


1.7
log
@clean up the bin/*/Makefiles...up version.h to v6.1 instead of v6.0

Remove bin/Makefile.global since it wasn't actually *doing* anything
that Makefile.global hadn't already done
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/bin/pgtclsh/Makefile,v 1.6 1997/04/04 10:42:11 scrappy Exp $
d17 1
a17 1
CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(SRCDIR)/libpgtcl
@


1.6
log
@This commit represents a clean compile with the new templates under
FreeBSD

The Makefile(s) have all been cleaned up such that there is a single
LDFLAGS vs LD_ADD or LDADD or LDFLAGS or LDFLAGS_BE.  The Makefile(s)
should be alot more straightforward then they were before...and
consistent
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/bin/pgtclsh/Makefile,v 1.5 1997/01/21 05:16:38 bryanh Exp $
a15 1
include ../Makefile.global
@


1.5
log
@Add link options for libpq library search.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/bin/pgtclsh/Makefile,v 1.4 1996/11/11 13:41:25 bryanh Exp $
d28 1
a28 1
	  $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LD_ADD)
d33 1
a33 1
	  $(TK_LIB) $(TCL_LIB) -lX11 -lm $(LD_ADD)
@


1.4
log
@Makefile simplification: the "bin" chapter
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/bin/pgtclsh/Makefile,v 1.3 1996/11/04 05:14:34 momjian Exp $
d22 1
@


1.3
log
@Rename CDEBUG to COPT
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/bin/pgtclsh/Makefile,v 1.2 1996/07/23 03:03:36 scrappy Exp $
d14 2
a15 2
MKDIR=	../../mk
include $(MKDIR)/postgres.mk
d18 1
a18 1
CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(srcdir)/libpgtcl
d21 1
a21 1
LIBPGTCL= -L$(srcdir)/libpgtcl/$(objdir) -L$(LIBDIR) -lpgtcl
d23 1
a23 3
pgtclsh: $(objdir)/pgtclAppInit.o
	$(CC) $(CFLAGS) -o $(objdir)/$(@@F) $(objdir)/pgtclAppInit.o\
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LD_ADD)
d25 3
a27 4
pgtksh: $(objdir)/pgtkAppInit.o
	$(CC) $(CFLAGS) -o $(objdir)/$(@@F) $(objdir)/pgtkAppInit.o \
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR) \
	$(TK_LIB) $(TCL_LIB) -lX11 -lm $(LD_ADD)
d29 4
a32 13
install::	localobj pgtclsh pgtksh
	$(INSTALL) $(INSTL_EXE_OPTS) $(objdir)/pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
	$(INSTALL) $(INSTL_EXE_OPTS) $(objdir)/pgtksh $(DESTDIR)$(BINDIR)/pgtksh

CLEANFILES = pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh

PROG=pgtclsh

all:: pgtclsh pgtksh

# don't use the default template for generating executables since we have
# two executable targets
# include $(MKDIR)/postgres.prog.mk
d34 3
d38 2
@


1.2
log
@Put in a new FAQ

Merged in Dr. George's src/bin tree (possibly broke monitor/psql in process)
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/bin/pgtclsh/Makefile,v 1.1.1.1 1996/07/09 06:22:15 scrappy Exp $
d24 1
a24 1
	$(CC) $(CDEBUG) -o $(objdir)/$(@@F) $(objdir)/pgtclAppInit.o\
d28 1
a28 1
	$(CC) $(CDEBUG) -o $(objdir)/$(@@F) $(objdir)/pgtkAppInit.o \
@


1.1
log
@Initial revision
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/postgres95/src/bin/pgtclsh/Makefile,v 1.1.1.1 1996/07/09 05:32:37 scrappy Exp $
d18 1
a18 1
CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR)
d29 1
a29 1
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) \
@


1.1.1.1
log
@Postgres95 1.01 Distribution - Virgin Sources
@
text
@@
