head	1.12;
access;
symbols
	PG95_1_01:1.12
	PG95_1_0:1.11
	PG95_beta_03:1.11
	PG95_beta_02:1.5
	PG95_beta:1.3;
locks; strict;
comment	@# @;


1.12
date	96.02.24.01.10.48;	author jolly;	state Exp;
branches;
next	1.11;

1.11
date	95.07.21.19.38.43;	author jolly;	state Exp;
branches;
next	1.10;

1.10
date	95.07.21.05.38.22;	author jolly;	state Exp;
branches;
next	1.9;

1.9
date	95.07.18.22.17.20;	author jolly;	state Exp;
branches;
next	1.8;

1.8
date	95.07.11.20.37.58;	author jolly;	state Exp;
branches;
next	1.7;

1.7
date	95.06.08.10.00.22;	author jolly;	state Exp;
branches;
next	1.6;

1.6
date	95.06.08.00.03.01;	author jolly;	state Exp;
branches;
next	1.5;

1.5
date	95.05.22.22.16.03;	author jolly;	state Exp;
branches;
next	1.4;

1.4
date	95.05.22.22.01.51;	author jolly;	state Exp;
branches;
next	1.3;

1.3
date	95.05.01.13.53.15;	author andrew;	state Exp;
branches;
next	1.2;

1.2
date	95.02.14.23.59.26;	author jolly;	state Exp;
branches;
next	1.1;

1.1
date	95.02.05.05.02.12;	author jolly;	state Exp;
branches;
next	;


desc
@@


1.12
log
@$(LD_ADD) is needed to link for some ports
@
text
@#-------------------------------------------------------------------------
#
# Makefile
#    Makefile for a tclsh workalike with pgtcl commands installed
#
# Copyright (c) 1994, Regents of the University of California
#
#
# IDENTIFICATION
#    $Header: /home/jolly/POSTGRES_MASTER_CVS/src/bin/pgtclsh/Makefile,v 1.11 1995/07/21 19:38:43 jolly Exp $
#
#-------------------------------------------------------------------------

MKDIR=	../../mk
include $(MKDIR)/postgres.mk
include ../Makefile.global

CFLAGS+=  -I$(TCL_INCDIR) -I$(TK_INCDIR)

# try to find libpgtcl.a in either directory
LIBPGTCL= -L$(srcdir)/libpgtcl/$(objdir) -L$(LIBDIR) -lpgtcl

pgtclsh: $(objdir)/pgtclAppInit.o
	$(CC) $(CDEBUG) -o $(objdir)/$(@@F) $(objdir)/pgtclAppInit.o\
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LD_ADD)

pgtksh: $(objdir)/pgtkAppInit.o
	$(CC) $(CDEBUG) -o $(objdir)/$(@@F) $(objdir)/pgtkAppInit.o \
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) \
	$(TK_LIB) $(TCL_LIB) -lX11 -lm $(LD_ADD)

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


@


1.11
log
@moved tcl/tk variables to src/Makefile.global
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.10 1995/07/21 05:38:22 jolly Exp $
d25 1
a25 1
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm
d30 1
a30 1
	$(TK_LIB) $(TCL_LIB) -lX11 -lm
@


1.10
log
@*** empty log message ***
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.9 1995/07/18 22:17:20 jolly Exp $
a17 7
# location of tcl and tk libraries.
TCL_INCDIR= /usr/local/devel/tcl7.4/include
TCL_LIBDIR= /usr/local/devel/tcl7.4/lib
TCL_LIB = -ltcl7.4
TK_INCDIR=  /usr/local/devel/tk4.0/include
TK_LIBDIR=  /usr/local/devel/tk4.0/lib
TK_LIB = -ltk4.0
@


1.9
log
@add third argument to Tcl_Main() and Tk_Main() to conform to Tcl7.4 and
Tk4.0 releases
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.8 1995/07/11 20:37:58 jolly Exp $
d47 1
a47 1
all: pgtclsh pgtksh
@


1.8
log
@add in linking of libpq
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.7 1995/06/08 10:00:22 jolly Exp $
d19 6
a24 5
TCL_INCDIR= /usr/local/devel/tcl/include
TCL_LIBDIR= /usr/local/devel/tcl/lib
TK_INCDIR=  /usr/local/devel/tk/include
TK_LIBDIR=  /usr/local/devel/tk/lib

d32 1
a32 1
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -ltcl -lm
d36 2
a37 1
	$(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -ltk -ltcl -lX11 -lm
@


1.7
log
@fixed a typo in the install rules for pgtclsh
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.6 1995/06/08 00:03:01 jolly Exp $
d16 1
d24 1
a24 4
CFLAGS+= -I$(srcdir)/backend/include \
	 -I$(srcdir)/backend \
	 -I$(srcdir)/libpgtcl \
	 -I$(TCL_INCDIR) -I$(TK_INCDIR)
a28 7
LD_ADD = $(LIBPGTCL) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -ltk -ltcl -lX11 -lm

ifdef KRBVERS
LDADD+= $(KRBLIBS)
CFLAGS+= $(KRBFLAGS)
endif

d30 2
a31 2
	$(CC) $(CDEBUG) -o $(objdir)/$(@@F) $(objdir)/pgtclAppInit.o \
	$(LIBPGTCL) -L$(TCL_LIBDIR) -ltcl -lm
d35 1
a35 1
	$(LIBPGTCL) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -ltk -ltcl -lX11 -lm
@


1.6
log
@add in a PROG=pgtclsh to avoid gmake complaints on some system.
(because of interaction between the 'all' target in postgres.mk)
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.5 1995/05/22 22:16:03 jolly Exp $
d47 1
a47 1
	$(INSTALL) $(INSTL_EXE_OPTS) $(objdir)/pgtclsh $(DESTDIR)$(BINDIR)/pgtlcsh
@


1.5
log
@*** empty log message ***
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.4 1995/05/22 22:01:51 jolly Exp $
d52 2
@


1.4
log
@add in explicit targets pgtclsh and pgtksh
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.3 1995/05/01 13:53:15 andrew Exp $
a13 3
#PROG= pgtclsh2
#PROG = pgtclsh

a27 3
#SRCS= pgtkAppInit.c 
SRCS = pgtclAppInit.c

d54 2
@


1.3
log
@is now a GNU makefile
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.2 1995/02/14 23:59:26 jolly Exp $
d14 1
a14 1
PROG= pgtksh
d31 2
a32 2
SRCS= pgtkAppInit.c 
#SRCS = pgtclAppInit.c
d44 3
a46 1
include $(MKDIR)/postgres.prog.mk
d48 3
d52 11
@


1.2
log
@The Makefile points to /usr/local/devel for tcl/tk stuff by default now.
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/bin/pgtclsh/Makefile,v 1.1 1995/02/05 05:02:12 jolly Exp $
d14 5
d20 10
a29 1
.include <postgres.global.mk>
d31 2
a32 9
TCL_INCDIR := /usr/local/devel/tcl/include
TCL_LIBDIR := /usr/local/devel/tcl/lib
TK_INCDIR := /usr/local/devel/tk/include
TK_LIBDIR := /usr/local/devel/tk/lib

CFLAGS+= -I${.CURDIR}/../backend/include \
	 -I${.CURDIR}/../backend \
	 -I${.CURDIR}/../../libpgtcl\
	 -I${TCL_INCDIR} -I${TK_INCDIR}
d34 2
a35 1
LDFLAGS += -L${TCL_LIBDIR} -L${TK_LIBDIR}
d37 1
a37 2
PROG= pgtksh
#PROG = pgtclsh
d39 4
a42 2
SRCS= pgtkAppInit.c 
#SRCS = pgtclAppInit.c
d44 1
a44 12
.if exists(${.CURDIR}/../../libpgtcl/${MAKEOBJDIR}/libpgtcl.a)
LIBPGTCL= ${.CURDIR}/../../libpgtcl/${MAKEOBJDIR}/libpgtcl.a
.elif exists(${LIBDIR}/libpgtcl.a)
LIBPGTCL= ${LIBDIR}/libpgtcl.a
.endif

LDADD = $(LIBPGTCL) -ltk -ltcl -lX11 -lm

.ifdef KRBVERS
LDADD+= ${KRBLIBS}
CFLAGS+= ${KRBFLAGS}
.endif
a45 1
.include <postgres.prog.mk>
@


1.1
log
@Tcl/Tk 'wish' compiled with pgtcl features.
@
text
@d10 1
a10 1
#    $Header: /usr/local/devel/pglite/cvs/src/libpq/Makefile,v 1.4 1995/01/16 22:42:42 jolly Exp $
d17 4
a20 4
TCL_INCDIR := /private/osf/include
TCL_LIBDIR := /private/osf/lib
TK_INCDIR := /private/osf/include
TK_LIBDIR := /private/osf/lib
d27 1
a27 1
LDFLAGS += -L${TCL_LIBDIR}
d30 1
d33 1
@
