head	1.174;
access;
symbols
	core-8-5-9:1.143.2.9
	core-8-5-8:1.143.2.6
	macosx-cocoa-merge:1.154
	macosx-cocoa-premerge:1.153
	macosx-carbon-freeze:1.152
	core-8-5-7:1.143.2.3
	core-8-5-6:1.143.2.1
	core-8-6-b1:1.147
	core-8-6-a3:1.145
	core-8-5-5:1.143.2.1
	core-8-6-a2:1.144
	core-8-5-4:1.143
	core-8-5-3:1.143
	core-8-6-a1:1.144
	core-8-4-19:1.87.2.21
	core-8-5-branch:1.143.0.2
	core-8-5-2:1.143
	core-8-4-18:1.87.2.21
	core-8-5-1:1.138
	core-8-4-17:1.87.2.21
	core-8-5-0:1.138
	core-8-5-b3:1.137
	core-8-5-b2:1.137
	core-8-4-16:1.87.2.21
	core-8-5-b1:1.137
	core-stablilizer-merge:1.130
	core-stabilizer-branch:1.128.0.2
	core-stabilizer-merge:1.143
	core-8-4-15:1.87.2.20
	core-8-5-a6:1.127
	core-8-5-a5:1.116
	core-8-4-14:1.87.2.19
	core-8-5-a4:1.114
	core-8-4-13:1.87.2.17
	core-8-4-12:1.87.2.17
	core-8-4-11:1.87.2.11
	core-8-5-a3:1.105
	core-8-4-10:1.87.2.10
	core-8-4-9-branch:1.87.2.6.0.2
	core-8-5-a2:1.99
	core-8-4-9:1.87.2.6
	core-8-4-8:1.87.2.6
	core-8-4-7:1.87.2.3
	core-8-5-a1:1.91
	core-8-4-6:1.87.2.2
	core-8-4-5:1.87.2.2
	mistachkin-dev-branch:1.89.0.2
	core-8-4-4:1.87.2.1
	core-8-4-3:1.87.2.1
	core-8-4-branch:1.87.0.2
	core-8-4-2:1.87
	core-8-4-1:1.85
	core-8-3-5:1.45.2.6
	core-8-4-0:1.81
	macosx-8-4-merge-2002-08-31-trunk:1.80
	macosx-8-4-premerge-2002-08-31-branch:1.54.2.3
	macosx-8-4-premerge-2002-08-31-trunk:1.80
	macosx-8-4-merge-2002-08-30-branch:1.54.2.3
	macosx-8-4-merge-2002-08-30-trunk:1.80
	macosx-8-4-merge-2002-08-20-branch:1.54.2.3
	macosx-8-4-merge-2002-08-20-trunk:1.80
	core-8-4-b2:1.78
	core-8-4-b1:1.73
	macosx-premerge-6-9-02:1.54.2.1
	core-8-4-a4:1.64
	core-8-3-4:1.45.2.4
	macosx-8-4-branch:1.54.0.2
	macosx-8-4-branchpoint:1.54
	core-8-4-a3:1.53
	core-8-3-3:1.45.2.3
	dgp-privates-into-namespace:1.49.0.4
	tclpro-1-5-0:1.45.2.1
	core-8-4-win-speedup:1.49.0.2
	core-8-4-a2:1.49
	tclpro-1-4-1:1.45.2.1
	tclpro-1-4-0:1.45.2.1
	core-8-3-2:1.45.2.1
	ajuba-ajuba2-2-1-base:1.45.2.1
	ajuba-ajuba2-2-0:1.45
	core-8-4-a1:1.46
	core-8-3-1-branch:1.45.0.2
	core-8-3-1:1.45
	scriptics-sc-2-0-b5:1.42
	scriptics-sc-2-0-fixed:1.42
	scriptics-sc-2-0-b2:1.42
	scriptics-sc-2-0-b1:1.42
	core-8-3-0:1.40
	core-8-3-b2:1.37
	core-8-3-b1:1.35
	scriptics-sc-1-1:1.29.4.4
	scriptics-sc-1-1-b1:1.29.4.4
	core-8-2-3:1.29.4.4
	scriptics-sc-1-1-branch:1.29.4.4.0.4
	scriptics-sc-1-1-base:1.29.4.4
	scriptics-sc-1-0:1.29.4.4
	scriptics-sc-1-0-branch:1.29.4.4.0.2
	scriptics-sc-1-0-base:1.29.4.4
	core-8-2-2:1.29.4.4
	core-8-2-1:1.29.4.4
	scriptics-bc-1-0-b1:1.29.4.4
	core-8-2-1-branch:1.29.0.4
	scriptics-tclpro-1-3-0:1.29
	core-8-2-0:1.29
	core-8-2-b3-branch:1.29.0.2
	core-8-2-b3-base:1.29
	scriptics-tclpro-1-3-b4:1.28
	core-8-2-b2:1.28
	core-8-2-b1:1.23
	scriptics-tclpro-1-3-b3:1.23
	scriptics-tclpro-1-3-b2:1.17
	merge-to-mainline-5/21/99:1.17
	scriptics-tclpro-1-3-b2-branch:1.17.0.2
	core-8-1-1:1.17
	scriptics-tclpro-1-3-b1:1.17
	core-8-1-1-base:1.17
	core-8-1-0:1.15
	merge-to-mainline-4-29-99:1.15
	merge-to-mainline-4-23-99:1.15
	core-8-1-branch-old:1.1.0.4
	core-8-0-6-branch:1.13.0.2
	core-8-0-6-base:1.13
	core-8-0-5:1.11
	core-8-1-b3:1.1.4.13
	core-8-1-b2:1.1.4.9
	dev-8-1-stubs-branch:1.1.4.4.0.2
	dev-stubs-branch:1.11.0.4
	scriptics-tclpro-1-2:1.11
	scriptics-tclpro-1-2-b2:1.11
	core-8-1-merge-2/10/99:1.11
	core-8-0-5-branch:1.11.0.2
	core-8-0-5-base:1.11
	scriptics-tclpro-1-2-b1:1.11
	scriptics-tclpro-1-2-a1:1.11
	core-8-1-b1:1.1.4.3
	core-8-0-4:1.11
	core-8-1-a2:1.1.4.1
	core-8-0-2:1.1
	core-8-0-3:1.9;
locks; strict;
comment	@# @;


1.174
date	2010.12.17.23.13.32;	author stwo;	state Exp;
branches;
next	1.173;

1.173
date	2010.12.17.21.57.46;	author stwo;	state Exp;
branches;
next	1.172;

1.172
date	2010.12.17.17.57.45;	author stwo;	state Exp;
branches;
next	1.171;

1.171
date	2010.12.16.01.55.02;	author stwo;	state Exp;
branches;
next	1.170;

1.170
date	2010.08.27.01.00.23;	author hobbs;	state Exp;
branches;
next	1.169;

1.169
date	2010.08.12.00.34.56;	author hobbs;	state Exp;
branches;
next	1.168;

1.168
date	2010.03.23.10.45.13;	author dkf;	state Exp;
branches;
next	1.167;

1.167
date	2010.02.22.23.38.53;	author nijtmans;	state Exp;
branches;
next	1.166;

1.166
date	2010.02.19.15.02.54;	author dkf;	state Exp;
branches;
next	1.165;

1.165
date	2009.12.23.07.16.52;	author nijtmans;	state Exp;
branches;
next	1.164;

1.164
date	2009.11.23.16.09.33;	author dkf;	state Exp;
branches;
next	1.163;

1.163
date	2009.11.23.15.59.18;	author dkf;	state Exp;
branches;
next	1.162;

1.162
date	2009.11.19.23.45.08;	author nijtmans;	state Exp;
branches;
next	1.161;

1.161
date	2009.11.19.22.21.01;	author nijtmans;	state Exp;
branches;
next	1.160;

1.160
date	2009.11.10.23.36.19;	author andreas_kupries;	state Exp;
branches;
next	1.159;

1.159
date	2009.10.26.16.56.46;	author dgp;	state Exp;
branches;
next	1.158;

1.158
date	2009.10.20.17.23.09;	author dgp;	state Exp;
branches;
next	1.157;

1.157
date	2009.10.20.16.57.25;	author dgp;	state Exp;
branches;
next	1.156;

1.156
date	2009.08.24.00.57.20;	author das;	state Exp;
branches;
next	1.155;

1.155
date	2009.07.18.08.16.09;	author das;	state Exp;
branches;
next	1.154;

1.154
date	2009.06.29.14.35.01;	author das;	state Exp;
branches;
next	1.153;

1.153
date	2009.06.26.01.42.05;	author das;	state Exp;
branches;
next	1.152;

1.152
date	2009.04.24.15.34.41;	author stwo;	state Exp;
branches;
next	1.151;

1.151
date	2009.04.24.15.07.48;	author stwo;	state Exp;
branches;
next	1.150;

1.150
date	2009.03.14.17.35.04;	author dkf;	state Exp;
branches;
next	1.149;

1.149
date	2009.01.20.03.39.06;	author kennykb;	state Exp;
branches;
next	1.148;

1.148
date	2008.12.28.13.08.38;	author dkf;	state Exp;
branches;
next	1.147;

1.147
date	2008.12.05.10.48.52;	author dkf;	state Exp;
branches;
next	1.146;

1.146
date	2008.10.18.14.22.22;	author dkf;	state Exp;
branches;
next	1.145;

1.145
date	2008.08.25.11.44.03;	author dkf;	state Exp;
branches;
next	1.144;

1.144
date	2008.04.02.03.55.39;	author dgp;	state Exp;
branches;
next	1.143;

1.143
date	2008.03.21.21.49.12;	author jenglish;	state Exp;
branches
	1.143.2.1;
next	1.142;

1.142
date	2008.03.19.17.21.47;	author das;	state Exp;
branches;
next	1.141;

1.141
date	2008.03.18.06.59.04;	author jenglish;	state Exp;
branches;
next	1.140;

1.140
date	2008.03.12.16.17.17;	author das;	state Exp;
branches;
next	1.139;

1.139
date	2008.03.11.22.33.22;	author das;	state Exp;
branches;
next	1.138;

1.138
date	2007.12.13.15.28.49;	author dgp;	state Exp;
branches;
next	1.137;

1.137
date	2007.09.11.17.46.41;	author dgp;	state Exp;
branches;
next	1.136;

1.136
date	2007.09.06.19.34.02;	author dgp;	state Exp;
branches;
next	1.135;

1.135
date	2007.09.05.01.39.45;	author das;	state Exp;
branches;
next	1.134;

1.134
date	2007.09.04.19.19.01;	author dgp;	state Exp;
branches;
next	1.133;

1.133
date	2007.09.04.18.46.29;	author dgp;	state Exp;
branches;
next	1.132;

1.132
date	2007.08.07.05.07.21;	author das;	state Exp;
branches;
next	1.131;

1.131
date	2007.07.09.19.35.34;	author hobbs;	state Exp;
branches;
next	1.130;

1.130
date	2007.06.03.13.43.34;	author das;	state Exp;
branches;
next	1.129;

1.129
date	2007.05.25.22.55.03;	author jenglish;	state Exp;
branches;
next	1.128;

1.128
date	2007.05.14.20.58.27;	author dgp;	state Exp;
branches
	1.128.2.1;
next	1.127;

1.127
date	2007.04.26.21.02.27;	author hobbs;	state Exp;
branches;
next	1.126;

1.126
date	2007.04.25.17.09.13;	author hobbs;	state Exp;
branches;
next	1.125;

1.125
date	2007.04.25.03.40.59;	author das;	state Exp;
branches;
next	1.124;

1.124
date	2007.04.25.02.49.25;	author das;	state Exp;
branches;
next	1.123;

1.123
date	2007.04.24.15.55.50;	author hobbs;	state Exp;
branches;
next	1.122;

1.122
date	2007.04.23.21.24.35;	author das;	state Exp;
branches;
next	1.121;

1.121
date	2007.03.07.23.46.33;	author das;	state Exp;
branches;
next	1.120;

1.120
date	2006.12.13.23.04.33;	author hobbs;	state Exp;
branches;
next	1.119;

1.119
date	2006.12.13.20.38.28;	author hobbs;	state Exp;
branches;
next	1.118;

1.118
date	2006.10.31.13.56.59;	author das;	state Exp;
branches;
next	1.117;

1.117
date	2006.10.31.01.42.27;	author hobbs;	state Exp;
branches;
next	1.116;

1.116
date	2006.09.27.18.43.35;	author andreas_kupries;	state Exp;
branches;
next	1.115;

1.115
date	2006.09.22.19.02.07;	author andreas_kupries;	state Exp;
branches;
next	1.114;

1.114
date	2006.04.11.18.09.07;	author dgp;	state Exp;
branches;
next	1.113;

1.113
date	2006.03.08.22.54.05;	author dgp;	state Exp;
branches;
next	1.112;

1.112
date	2006.03.08.22.17.29;	author dgp;	state Exp;
branches;
next	1.111;

1.111
date	2005.12.09.00.48.54;	author das;	state Exp;
branches;
next	1.110;

1.110
date	2005.12.08.21.13.17;	author hobbs;	state Exp;
branches;
next	1.109;

1.109
date	2005.11.27.02.36.15;	author das;	state Exp;
branches;
next	1.108;

1.108
date	2005.08.25.04.13.42;	author das;	state Exp;
branches;
next	1.107;

1.107
date	2005.08.23.18.25.34;	author mdejong;	state Exp;
branches;
next	1.106;

1.106
date	2005.07.05.20.56.50;	author dgp;	state Exp;
branches;
next	1.105;

1.105
date	2005.05.25.20.32.33;	author hobbs;	state Exp;
branches;
next	1.104;

1.104
date	2005.05.24.00.32.55;	author das;	state Exp;
branches;
next	1.103;

1.103
date	2005.05.23.20.24.59;	author das;	state Exp;
branches;
next	1.102;

1.102
date	2005.04.26.00.46.53;	author das;	state Exp;
branches;
next	1.101;

1.101
date	2005.02.11.18.31.56;	author hobbs;	state Exp;
branches;
next	1.100;

1.100
date	2005.01.10.18.57.39;	author jenglish;	state Exp;
branches;
next	1.99;

1.99
date	2004.12.07.00.35.03;	author hobbs;	state Exp;
branches;
next	1.98;

1.98
date	2004.11.18.13.22.47;	author rmax;	state Exp;
branches;
next	1.97;

1.97
date	2004.11.18.00.43.19;	author rmax;	state Exp;
branches;
next	1.96;

1.96
date	2004.08.19.17.59.18;	author dgp;	state Exp;
branches;
next	1.95;

1.95
date	2004.07.20.10.23.51;	author das;	state Exp;
branches;
next	1.94;

1.94
date	2004.07.16.23.40.29;	author hobbs;	state Exp;
branches;
next	1.93;

1.93
date	2004.04.24.06.00.18;	author das;	state Exp;
branches;
next	1.92;

1.92
date	2004.03.17.18.15.50;	author das;	state Exp;
branches;
next	1.91;

1.91
date	2004.03.04.00.07.06;	author hobbs;	state Exp;
branches;
next	1.90;

1.90
date	2003.11.11.00.07.37;	author hobbs;	state Exp;
branches;
next	1.89;

1.89
date	2003.05.31.18.32.20;	author jenglish;	state Exp;
branches;
next	1.88;

1.88
date	2003.04.04.19.29.38;	author mdejong;	state Exp;
branches;
next	1.87;

1.87
date	2002.11.19.02.20.35;	author hobbs;	state Exp;
branches
	1.87.2.1;
next	1.86;

1.86
date	2002.11.07.06.38.19;	author das;	state Exp;
branches;
next	1.85;

1.85
date	2002.10.10.05.01.23;	author hobbs;	state Exp;
branches;
next	1.84;

1.84
date	2002.09.27.00.47.26;	author hobbs;	state Exp;
branches;
next	1.83;

1.83
date	2002.09.26.17.07.33;	author das;	state Exp;
branches;
next	1.82;

1.82
date	2002.09.10.09.59.15;	author das;	state Exp;
branches;
next	1.81;

1.81
date	2002.08.31.13.28.45;	author das;	state Exp;
branches;
next	1.80;

1.80
date	2002.08.16.07.52.23;	author hobbs;	state Exp;
branches;
next	1.79;

1.79
date	2002.08.08.11.43.08;	author rmax;	state Exp;
branches;
next	1.78;

1.78
date	2002.07.28.03.23.08;	author mdejong;	state Exp;
branches;
next	1.77;

1.77
date	2002.07.16.23.17.09;	author mdejong;	state Exp;
branches;
next	1.76;

1.76
date	2002.07.14.05.48.46;	author dgp;	state Exp;
branches;
next	1.75;

1.75
date	2002.07.12.13.41.01;	author dgp;	state Exp;
branches;
next	1.74;

1.74
date	2002.07.08.22.08.49;	author davygrvy;	state Exp;
branches;
next	1.73;

1.73
date	2002.06.26.02.38.26;	author dgp;	state Exp;
branches;
next	1.72;

1.72
date	2002.06.25.16.45.12;	author rmax;	state Exp;
branches;
next	1.71;

1.71
date	2002.06.21.23.09.53;	author hobbs;	state Exp;
branches;
next	1.70;

1.70
date	2002.06.21.20.24.29;	author dgp;	state Exp;
branches;
next	1.69;

1.69
date	2002.06.18.23.51.46;	author dkf;	state Exp;
branches;
next	1.68;

1.68
date	2002.06.17.20.17.55;	author hobbs;	state Exp;
branches;
next	1.67;

1.67
date	2002.06.14.23.10.42;	author jenglish;	state Exp;
branches;
next	1.66;

1.66
date	2002.06.14.22.25.12;	author jenglish;	state Exp;
branches;
next	1.65;

1.65
date	2002.03.06.18.54.16;	author davygrvy;	state Exp;
branches;
next	1.64;

1.64
date	2002.03.05.19.44.43;	author davygrvy;	state Exp;
branches;
next	1.63;

1.63
date	2002.02.22.02.41.17;	author hobbs;	state Exp;
branches;
next	1.62;

1.62
date	2002.01.29.08.04.37;	author mdejong;	state Exp;
branches;
next	1.61;

1.61
date	2002.01.11.19.58.51;	author mdejong;	state Exp;
branches;
next	1.60;

1.60
date	2002.01.11.18.41.04;	author mdejong;	state Exp;
branches;
next	1.59;

1.59
date	2001.12.19.07.45.52;	author mdejong;	state Exp;
branches;
next	1.58;

1.58
date	2001.11.25.06.43.44;	author mdejong;	state Exp;
branches;
next	1.57;

1.57
date	2001.11.23.02.04.21;	author das;	state Exp;
branches;
next	1.56;

1.56
date	2001.11.11.03.21.24;	author mdejong;	state Exp;
branches;
next	1.55;

1.55
date	2001.11.09.07.14.23;	author mdejong;	state Exp;
branches;
next	1.54;

1.54
date	2001.08.07.20.17.13;	author hobbs;	state Exp;
branches
	1.54.2.1;
next	1.53;

1.53
date	2001.07.11.01.36.41;	author mdejong;	state Exp;
branches;
next	1.52;

1.52
date	2001.06.27.02.06.13;	author mdejong;	state Exp;
branches;
next	1.51;

1.51
date	2001.06.22.23.59.48;	author mdejong;	state Exp;
branches;
next	1.50;

1.50
date	2001.04.25.20.52.48;	author mdejong;	state Exp;
branches;
next	1.49;

1.49
date	2000.09.29.21.40.54;	author hobbs;	state Exp;
branches
	1.49.2.1
	1.49.4.1;
next	1.48;

1.48
date	2000.09.02.01.18.24;	author ericm;	state Exp;
branches;
next	1.47;

1.47
date	2000.06.30.06.38.40;	author ericm;	state Exp;
branches;
next	1.46;

1.46
date	2000.05.03.00.18.19;	author hobbs;	state Exp;
branches;
next	1.45;

1.45
date	2000.04.25.21.00.07;	author hobbs;	state Exp;
branches
	1.45.2.1;
next	1.44;

1.44
date	2000.04.04.08.09.31;	author hobbs;	state Exp;
branches;
next	1.43;

1.43
date	2000.03.30.19.02.31;	author ericm;	state Exp;
branches;
next	1.42;

1.42
date	2000.03.02.23.53.07;	author hobbs;	state Exp;
branches;
next	1.41;

1.41
date	2000.02.14.22.43.32;	author ericm;	state Exp;
branches;
next	1.40;

1.40
date	2000.02.10.08.53.14;	author hobbs;	state Exp;
branches;
next	1.39;

1.39
date	2000.02.08.11.31.36;	author hobbs;	state Exp;
branches;
next	1.38;

1.38
date	2000.01.16.05.33.08;	author hobbs;	state Exp;
branches;
next	1.37;

1.37
date	2000.01.12.11.46.05;	author hobbs;	state Exp;
branches;
next	1.36;

1.36
date	2000.01.06.02.22.44;	author hobbs;	state Exp;
branches;
next	1.35;

1.35
date	99.12.13.23.03.36;	author wart;	state Exp;
branches;
next	1.34;

1.34
date	99.11.12.23.54.22;	author wart;	state Exp;
branches;
next	1.33;

1.33
date	99.10.20.01.02.34;	author hobbs;	state Exp;
branches;
next	1.32;

1.32
date	99.10.01.22.45.27;	author hobbs;	state Exp;
branches;
next	1.31;

1.31
date	99.09.21.06.43.00;	author hobbs;	state Exp;
branches;
next	1.30;

1.30
date	99.08.21.01.14.45;	author wart;	state Exp;
branches;
next	1.29;

1.29
date	99.08.04.23.42.15;	author wart;	state Exp;
branches
	1.29.2.1
	1.29.4.1;
next	1.28;

1.28
date	99.07.27.16.46.12;	author redman;	state Exp;
branches;
next	1.27;

1.27
date	99.07.23.16.21.13;	author redman;	state Exp;
branches;
next	1.26;

1.26
date	99.07.22.21.51.25;	author redman;	state Exp;
branches;
next	1.25;

1.25
date	99.07.22.01.32.20;	author redman;	state Exp;
branches;
next	1.24;

1.24
date	99.07.16.21.43.28;	author redman;	state Exp;
branches;
next	1.23;

1.23
date	99.07.13.22.19.06;	author redman;	state Exp;
branches;
next	1.22;

1.22
date	99.06.30.16.21.26;	author redman;	state Exp;
branches;
next	1.21;

1.21
date	99.06.22.18.56.57;	author wart;	state Exp;
branches;
next	1.20;

1.20
date	99.06.18.18.44.01;	author wart;	state Exp;
branches;
next	1.19;

1.19
date	99.06.16.20.11.29;	author surles;	state Exp;
branches;
next	1.18;

1.18
date	99.06.15.22.23.19;	author wart;	state Exp;
branches;
next	1.17;

1.17
date	99.04.30.18.02.39;	author redman;	state Exp;
branches;
next	1.16;

1.16
date	99.04.28.18.38.04;	author redman;	state Exp;
branches;
next	1.15;

1.15
date	99.04.20.01.48.00;	author surles;	state Exp;
branches;
next	1.14;

1.14
date	99.04.16.01.51.44;	author stanton;	state Exp;
branches;
next	1.13;

1.13
date	99.03.10.07.04.45;	author stanton;	state Exp;
branches;
next	1.12;

1.12
date	99.03.06.00.23.43;	author stanton;	state Exp;
branches;
next	1.11;

1.11
date	98.10.20.20.02.37;	author rjohnson;	state Exp;
branches
	1.11.4.1;
next	1.10;

1.10
date	98.09.23.20.18.03;	author build;	state Exp;
branches;
next	1.9;

1.9
date	98.09.14.18.23.54;	author stanton;	state Exp;
branches;
next	1.8;

1.8
date	98.08.04.18.50.34;	author stanton;	state Exp;
branches;
next	1.7;

1.7
date	98.07.28.17.38.57;	author welch;	state Exp;
branches;
next	1.6;

1.6
date	98.07.22.13.39.50;	author escoffon;	state Exp;
branches;
next	1.5;

1.5
date	98.07.21.15.29.04;	author escoffon;	state Exp;
branches;
next	1.4;

1.4
date	98.07.20.16.57.30;	author welch;	state Exp;
branches;
next	1.3;

1.3
date	98.07.01.18.28.41;	author escoffon;	state Exp;
branches
	1.3.1.1;
next	1.2;

1.2
date	98.06.29.22.58.50;	author welch;	state Exp;
branches;
next	1.1;

1.1
date	98.04.01.09.59.31;	author rjohnson;	state Exp;
branches
	1.1.4.1;
next	;

1.1.4.1
date	98.09.29.00.25.58;	author stanton;	state Exp;
branches;
next	1.1.4.2;

1.1.4.2
date	98.09.30.02.19.10;	author stanton;	state Exp;
branches;
next	1.1.4.3;

1.1.4.3
date	98.11.25.21.16.40;	author stanton;	state Exp;
branches;
next	1.1.4.4;

1.1.4.4
date	99.02.16.12.03.59;	author lfb;	state Exp;
branches
	1.1.4.4.2.1;
next	1.1.4.5;

1.1.4.5
date	99.03.10.07.13.49;	author stanton;	state Exp;
branches;
next	1.1.4.6;

1.1.4.6
date	99.03.11.00.48.54;	author redman;	state Exp;
branches;
next	1.1.4.7;

1.1.4.7
date	99.03.11.19.01.59;	author hershey;	state Exp;
branches;
next	1.1.4.8;

1.1.4.8
date	99.03.13.18.28.41;	author welch;	state Exp;
branches;
next	1.1.4.9;

1.1.4.9
date	99.03.14.19.26.03;	author stanton;	state Exp;
branches;
next	1.1.4.10;

1.1.4.10
date	99.03.30.02.08.03;	author redman;	state Exp;
branches;
next	1.1.4.11;

1.1.4.11
date	99.04.01.21.58.51;	author redman;	state Exp;
branches;
next	1.1.4.12;

1.1.4.12
date	99.04.06.02.57.58;	author hershey;	state Exp;
branches;
next	1.1.4.13;

1.1.4.13
date	99.04.07.00.36.10;	author stanton;	state Exp;
branches;
next	;

1.1.4.4.2.1
date	99.03.10.02.23.05;	author redman;	state Exp;
branches;
next	;

1.3.1.1
date	98.07.21.13.44.53;	author escoffon;	state Exp;
branches;
next	1.3.1.2;

1.3.1.2
date	98.07.21.15.24.33;	author escoffon;	state Exp;
branches;
next	;

1.11.4.1
date	99.03.06.02.23.18;	author redman;	state Exp;
branches;
next	1.11.4.2;

1.11.4.2
date	99.03.06.23.07.52;	author stanton;	state Exp;
branches;
next	1.11.4.3;

1.11.4.3
date	99.03.07.02.13.04;	author redman;	state Exp;
branches;
next	;

1.29.2.1
date	99.08.11.20.50.47;	author redman;	state Exp;
branches;
next	;

1.29.4.1
date	99.09.22.06.53.17;	author hobbs;	state Exp;
branches;
next	1.29.4.2;

1.29.4.2
date	99.09.23.22.03.32;	author wart;	state Exp;
branches;
next	1.29.4.3;

1.29.4.3
date	99.09.24.22.18.01;	author hobbs;	state Exp;
branches;
next	1.29.4.4;

1.29.4.4
date	99.10.02.01.08.18;	author hobbs;	state Exp;
branches;
next	;

1.45.2.1
date	2000.07.23.04.47.57;	author welch;	state Exp;
branches;
next	1.45.2.2;

1.45.2.2
date	2001.04.04.07.57.17;	author hobbs;	state Exp;
branches;
next	1.45.2.3;

1.45.2.3
date	2001.04.04.22.38.17;	author hobbs;	state Exp;
branches;
next	1.45.2.4;

1.45.2.4
date	2001.10.03.22.04.52;	author hobbs;	state Exp;
branches;
next	1.45.2.5;

1.45.2.5
date	2002.03.26.02.31.44;	author hobbs;	state Exp;
branches;
next	1.45.2.6;

1.45.2.6
date	2002.06.21.20.27.23;	author dgp;	state Exp;
branches;
next	;

1.49.2.1
date	2002.04.02.20.58.00;	author hobbs;	state Exp;
branches;
next	;

1.49.4.1
date	2001.07.03.20.01.09;	author dgp;	state Exp;
branches;
next	1.49.4.2;

1.49.4.2
date	2001.07.13.19.33.48;	author dgp;	state Exp;
branches;
next	;

1.54.2.1
date	2002.02.05.02.25.18;	author wolfsuit;	state Exp;
branches;
next	1.54.2.2;

1.54.2.2
date	2002.06.10.05.38.26;	author wolfsuit;	state Exp;
branches;
next	1.54.2.3;

1.54.2.3
date	2002.08.20.20.27.16;	author das;	state Exp;
branches;
next	;

1.87.2.1
date	2003.05.20.17.32.19;	author hobbs;	state Exp;
branches;
next	1.87.2.2;

1.87.2.2
date	2003.11.11.00.05.36;	author hobbs;	state Exp;
branches;
next	1.87.2.3;

1.87.2.3
date	2004.07.19.20.30.01;	author hobbs;	state Exp;
branches;
next	1.87.2.4;

1.87.2.4
date	2004.10.26.23.23.14;	author dgp;	state Exp;
branches;
next	1.87.2.5;

1.87.2.5
date	2004.11.18.02.08.59;	author rmax;	state Exp;
branches;
next	1.87.2.6;

1.87.2.6
date	2004.11.18.10.28.23;	author rmax;	state Exp;
branches;
next	1.87.2.7;

1.87.2.7
date	2005.02.10.23.42.01;	author hobbs;	state Exp;
branches;
next	1.87.2.8;

1.87.2.8
date	2005.04.26.00.49.50;	author das;	state Exp;
branches;
next	1.87.2.9;

1.87.2.9
date	2005.05.24.04.21.32;	author das;	state Exp;
branches;
next	1.87.2.10;

1.87.2.10
date	2005.05.25.17.46.40;	author hobbs;	state Exp;
branches;
next	1.87.2.11;

1.87.2.11
date	2005.06.23.06.00.29;	author das;	state Exp;
branches;
next	1.87.2.12;

1.87.2.12
date	2005.07.25.01.33.51;	author mdejong;	state Exp;
branches;
next	1.87.2.13;

1.87.2.13
date	2005.07.30.06.45.40;	author das;	state Exp;
branches;
next	1.87.2.14;

1.87.2.14
date	2005.08.09.07.40.03;	author das;	state Exp;
branches;
next	1.87.2.15;

1.87.2.15
date	2005.11.27.02.44.26;	author das;	state Exp;
branches;
next	1.87.2.16;

1.87.2.16
date	2005.12.01.19.03.14;	author dgp;	state Exp;
branches;
next	1.87.2.17;

1.87.2.17
date	2005.12.01.19.12.44;	author dgp;	state Exp;
branches;
next	1.87.2.18;

1.87.2.18
date	2006.09.22.19.01.51;	author andreas_kupries;	state Exp;
branches;
next	1.87.2.19;

1.87.2.19
date	2006.09.25.17.28.20;	author andreas_kupries;	state Exp;
branches;
next	1.87.2.20;

1.87.2.20
date	2007.04.29.02.25.36;	author das;	state Exp;
branches;
next	1.87.2.21;

1.87.2.21
date	2007.08.07.05.07.49;	author das;	state Exp;
branches;
next	;

1.128.2.1
date	2007.05.26.04.06.07;	author dgp;	state Exp;
branches;
next	1.128.2.2;

1.128.2.2
date	2007.06.04.15.19.01;	author dgp;	state Exp;
branches;
next	1.128.2.3;

1.128.2.3
date	2007.07.10.21.54.29;	author dgp;	state Exp;
branches;
next	1.128.2.4;

1.128.2.4
date	2007.09.04.17.44.24;	author dgp;	state Exp;
branches;
next	1.128.2.5;

1.128.2.5
date	2007.09.04.18.48.13;	author dgp;	state Exp;
branches;
next	1.128.2.6;

1.128.2.6
date	2007.09.04.19.21.24;	author dgp;	state Exp;
branches;
next	1.128.2.7;

1.128.2.7
date	2007.09.06.18.23.55;	author dgp;	state Exp;
branches;
next	1.128.2.8;

1.128.2.8
date	2007.09.07.01.25.37;	author dgp;	state Exp;
branches;
next	1.128.2.9;

1.128.2.9
date	2007.09.11.18.32.36;	author dgp;	state Exp;
branches;
next	1.128.2.10;

1.128.2.10
date	2008.03.13.14.57.34;	author dgp;	state Exp;
branches;
next	1.128.2.11;

1.128.2.11
date	2008.03.26.20.09.32;	author dgp;	state Exp;
branches;
next	;

1.143.2.1
date	2008.10.10.18.55.31;	author dgp;	state Exp;
branches;
next	1.143.2.2;

1.143.2.2
date	2009.01.20.03.54.53;	author kennykb;	state Exp;
branches;
next	1.143.2.3;

1.143.2.3
date	2009.04.10.11.07.32;	author dkf;	state Exp;
branches;
next	1.143.2.4;

1.143.2.4
date	2009.04.24.15.19.45;	author stwo;	state Exp;
branches;
next	1.143.2.5;

1.143.2.5
date	2009.04.24.15.40.06;	author stwo;	state Exp;
branches;
next	1.143.2.6;

1.143.2.6
date	2009.10.15.17.48.50;	author dgp;	state Exp;
branches;
next	1.143.2.7;

1.143.2.7
date	2010.01.06.23.16.20;	author nijtmans;	state Exp;
branches;
next	1.143.2.8;

1.143.2.8
date	2010.08.12.00.14.33;	author hobbs;	state Exp;
branches;
next	1.143.2.9;

1.143.2.9
date	2010.08.27.00.19.28;	author hobbs;	state Exp;
branches;
next	1.143.2.10;

1.143.2.10
date	2010.12.17.17.57.21;	author stwo;	state Exp;
branches;
next	1.143.2.11;

1.143.2.11
date	2010.12.17.21.57.14;	author stwo;	state Exp;
branches;
next	;


desc
@@


1.174
log
@Clean up '.PHONY:' targets: Arrange those common to Tcl and Tk as in Tcl's Makefile.in, add any missing ones and remove duplicates.
@
text
@#
# This file is a Makefile for Tk.  If it has the name "Makefile.in"
# then it is a template for a Makefile;  to generate the actual Makefile,
# run "./configure", which is a configuration script generated by the
# "autoconf" program (constructs like "@@foo@@" will get replaced in the
# actual Makefile.
#
# RCS: @@(#) $Id: Makefile.in,v 1.173 2010/12/17 21:57:46 stwo Exp $

# Current Tk version;  used in various names.

TCLVERSION		= @@TCL_VERSION@@
TCLPATCHL		= @@TCL_PATCH_LEVEL@@
VERSION 		= @@TK_VERSION@@
MAJOR_VERSION		= @@TK_MAJOR_VERSION@@
MINOR_VERSION		= @@TK_MINOR_VERSION@@
PATCH_LEVEL		= @@TK_PATCH_LEVEL@@
LOCALES			= @@LOCALES@@

#----------------------------------------------------------------
# Things you can change to personalize the Makefile for your own
# site (you can make these changes in either Makefile.in or
# Makefile, but changes to Makefile will get lost if you re-run
# the configuration script).
#----------------------------------------------------------------

# Default top-level directories in which to install architecture-
# specific files (exec_prefix) and machine-independent files such
# as scripts (prefix).  The values specified here may be overridden
# at configure-time with the --exec-prefix and --prefix options
# to the "configure" script.  The *dir vars are standard configure
# substitutions that are based off prefix and exec_prefix.

prefix			= @@prefix@@
exec_prefix		= @@exec_prefix@@
bindir			= @@bindir@@
libdir			= @@libdir@@
includedir		= @@includedir@@
datarootdir		= @@datarootdir@@
mandir			= @@mandir@@

# The following definition can be set to non-null for special systems
# like AFS with replication.  It allows the pathnames used for installation
# to be different than those used for actually reference files at
# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
INSTALL_ROOT		= $(DESTDIR)

# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TK_LIBRARY environment variable at
# run-time to override the compiled-in location):
TK_LIBRARY		= @@TK_LIBRARY@@

# Path to use at runtime to refer to LIB_INSTALL_DIR:
LIB_RUNTIME_DIR		= @@LIB_RUNTIME_DIR@@

# Directory in which to install the program wish:
BIN_INSTALL_DIR		= $(INSTALL_ROOT)$(bindir)

# Directory in which to install the .a or .so binary for the Tk library:
LIB_INSTALL_DIR		= $(INSTALL_ROOT)$(libdir)

# Path name to use when installing library scripts.
SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)

# Directory in which to install the include file tk.h:
INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)

# Path to the private tk header dir:
PRIVATE_INCLUDE_DIR	= @@PRIVATE_INCLUDE_DIR@@

# Directory in which to (optionally) install the private tk headers:
PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PRIVATE_INCLUDE_DIR)

# Top-level directory in which to install manual entries:
MAN_INSTALL_DIR		= $(INSTALL_ROOT)$(mandir)

# Directory in which to install manual entry for wish:
MAN1_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man1

# Directory in which to install manual entries for Tk's C library
# procedures:
MAN3_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man3

# Directory in which to install manual entries for the built-in
# Tcl commands implemented by Tk:
MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/mann

# Path to the html documentation dir:
HTML_DIR		= @@HTML_DIR@@

# Directory in which to install html documentation:
HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)

# Directory in which to install the configuration file tkConfig.sh:
CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)

# Directory in which to install the demo files:
DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos

# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
TCL_GENERIC_DIR		= @@TCL_SRC_DIR@@/generic

# The directory containing the platform specific Tcl sources and headers
# appropriate for this version of Tk:
TCL_PLATFORM_DIR	= @@TCL_SRC_DIR@@/unix

# The directory containing the Tcl library archive file appropriate
# for this version of Tk:
TCL_BIN_DIR		= @@TCL_BIN_DIR@@

# The linker flags needed to link in the Tcl library (ex: -ltcl8.2)
TCL_LIB_FLAG		= @@TCL_LIB_FLAG@@

# Flag, 1: we're building a shared lib, 0 we're not
TK_SHARED_BUILD		= @@TK_SHARED_BUILD@@

# Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
TK_PKG_DIR		= @@TK_PKG_DIR@@

# Directory in which to install the pkgIndex.tcl file for loadable Tk
PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)

# Package index file for loadable Tk
PKG_INDEX		= $(PKG_INSTALL_DIR)/pkgIndex.tcl

# warning flags
CFLAGS_WARNING		= @@CFLAGS_WARNING@@

# The default switches for optimization or debugging
CFLAGS_DEBUG		= @@CFLAGS_DEBUG@@
CFLAGS_OPTIMIZE		= -DNDEBUG @@CFLAGS_OPTIMIZE@@

# To change the compiler switches, for example to change from optimization to
# debugging symbols, change the following line:
#CFLAGS			= $(CFLAGS_DEBUG)
#CFLAGS			= $(CFLAGS_OPTIMIZE)
#CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
CFLAGS			= @@CFLAGS_DEFAULT@@ @@CFLAGS@@

# Flags to pass to the linker
LDFLAGS_DEBUG		= @@LDFLAGS_DEBUG@@
LDFLAGS_OPTIMIZE	= @@LDFLAGS_OPTIMIZE@@
LDFLAGS			= @@LDFLAGS_DEFAULT@@ @@LDFLAGS@@

# A "-I" switch that can be used when compiling to make all of the
# X11 include files accessible (the configure script will try to
# set this value, and will cause it to be an empty string if the
# include files are accessible via /usr/include).
X11_INCLUDES		= @@XINCLUDES@@

AQUA_INCLUDES		= -I$(MAC_OSX_DIR) -I$(XLIB_DIR)

# Linker switch(es) to use to link with the X11 library archive (the
# configure script will try to set this value automatically, but you
# can override it).
X11_LIB_SWITCHES	= $(XFT_LIBS) @@XLIBSW@@


# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
# following lines:
SECURITY_FLAGS		=
#SECURITY_FLAGS		= -DTK_NO_SECURITY

# To disable ANSI-C procedure prototypes reverse the comment characters
# on the following lines:
PROTO_FLAGS		=
#PROTO_FLAGS		= -DNO_PROTOTYPE

# To enable memory debugging reverse the comment characters on the following
# lines or call configure with --enable-symbols=mem
# Warning:  if you enable memory debugging, you must do it *everywhere*,
# including all the code that calls Tcl, and you must use ckalloc and
# ckfree everywhere instead of malloc and free.
MEM_DEBUG_FLAGS		=
#MEM_DEBUG_FLAGS	= -DTCL_MEM_DEBUG

# If your X server is X11R4 or earlier, then you may wish to reverse
# the comment characters on the following two lines.  This will enable
# extra code to speed up XStringToKeysym.  In X11R5 and later releases
# XStringToKeysym is plenty fast, so you needn't define REDO_KEYSYM_LOOKUP.
KEYSYM_FLAGS		=
#KEYSYM_FLAGS		= -DREDO_KEYSYM_LOOKUP

# Tk does not used deprecated Tcl constructs so it should
# compile fine with -DTCL_NO_DEPRECATED. To remove its own
# set of deprecated code uncomment the second line.
NO_DEPRECATED_FLAGS	= -DTCL_NO_DEPRECATED
#NO_DEPRECATED_FLAGS	= -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED

# Some versions of make, like SGI's, use the following variable to
# determine which shell to use for executing commands:
SHELL			= @@SHELL@@

# BUILD_TCLSH is the fully qualified path name of the tclsh shell
# in the Tcl build directory. Test that need to be run in the
# version of tclsh that we are building against should use this
# path. Targets that need an installed tclsh should not depend
# on this variable.

BUILD_TCLSH		= @@BUILD_TCLSH@@

# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
# running make for the first time. Certain build targets (make genstubs)
# need it to be available on the PATH. This executable should *NOT* be
# required just to do a normal build although it can be required to run
# make dist. This variable is set to "" if no tclsh is available.
EXE_SUFFIX		= @@EXEEXT@@
TCL_EXE			= @@TCLSH_PROG@@
WISH_EXE		= wish${EXE_SUFFIX}

# Tk used to let the configure script choose which program to use
# for installing, but there are just too many different versions of
# "install" around;  better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.

INSTALL_STRIP_PROGRAM   = -s
INSTALL_STRIP_LIBRARY   = -S -x

INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
INSTALL_PROGRAM		= ${INSTALL}
INSTALL_LIBRARY		= ${INSTALL}
INSTALL_DATA		= ${INSTALL} -m 644
INSTALL_DATA_DIR	= ${INSTALL} -d -m 755

# The symbol below provides support for dynamic loading and shared
# libraries.  See configure.in for a description of what it means.
# The value of the symbol is normally set by the configure script.

SHLIB_CFLAGS		= @@SHLIB_CFLAGS@@ -DBUILD_tk

# To enable support for stubs in Tcl.
STUB_LIB_FILE		= @@TK_STUB_LIB_FILE@@

TK_STUB_LIB_FILE	= @@TK_STUB_LIB_FILE@@
#TK_STUB_LIB_FILE	= libtkstub.a

# Generic stub lib name used in rules that apply to tcl and tk
STUB_LIB_FILE		= ${TK_STUB_LIB_FILE}

TK_STUB_LIB_FLAG	= @@TK_STUB_LIB_FLAG@@
#TK_STUB_LIB_FLAG	= -ltkstub

TK_LIB_FILE		= @@TK_LIB_FILE@@
#TK_LIB_FILE		= libtk.a

# Generic lib name used in rules that apply to tcl and tk
LIB_FILE		= ${TK_LIB_FILE}

TK_LIB_FLAG		= @@TK_LIB_FLAG@@
#TK_LIB_FLAG		= -ltk

TCL_LIB_SPEC		= @@TCL_LIB_SPEC@@
TCL_STUB_LIB_SPEC	= @@TCL_STUB_LIB_SPEC@@
TCL_STUB_LIB_FLAG	= @@TCL_STUB_LIB_FLAG@@
TCL_STUB_LIB_FILE	= @@TCL_STUB_LIB_FILE@@

TCL_STUB_FLAGS		= @@TCL_STUB_FLAGS@@

# Libraries to use when linking.  This definition is determined by the
# configure script.
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@TCL_LIBS@@
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@TCL_LIBS@@ @@EXTRA_WISH_LIBS@@

# The symbols below provide support for dynamic loading and shared
# libraries.  See configure.in for a description of what the
# symbols mean.  The values of the symbols are normally set by the
# configure script.  You shouldn't normally need to modify any of
# these definitions by hand.

STLIB_LD		= @@STLIB_LD@@
SHLIB_LD		= @@SHLIB_LD@@
SHLIB_LD_LIBS		= @@SHLIB_LD_LIBS@@
TK_SHLIB_LD_EXTRAS	= @@TK_SHLIB_LD_EXTRAS@@

# Additional search flags needed to find the various shared libraries
# at run-time.  The first symbol is for use when creating a binary
# with cc, and the second is for use when running ld directly.
CC_SEARCH_FLAGS	= @@CC_SEARCH_FLAGS@@
LD_SEARCH_FLAGS	= @@LD_SEARCH_FLAGS@@

# support for embedded libraries on Darwin / Mac OS X
DYLIB_INSTALL_DIR	= ${LIB_RUNTIME_DIR}

# support for building the Aqua resource file
TK_RSRC_FILE		= @@TK_RSRC_FILE@@
WISH_RSRC_FILE		= @@WISH_RSRC_FILE@@
REZ			= @@REZ@@
REZ_SWITCHES = @@REZ_FLAGS@@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR)

# support for Xft:
XFT_CFLAGS		= @@XFT_CFLAGS@@
XFT_LIBS		= @@XFT_LIBS@@

#----------------------------------------------------------------
# The information below is modified by the configure script when
# Makefile is generated from Makefile.in.  You shouldn't normally
# modify any of this stuff by hand.
#----------------------------------------------------------------

AC_FLAGS		= @@DEFS@@
AR			= @@AR@@
RANLIB			= @@RANLIB@@
SRC_DIR			= @@srcdir@@
TOP_DIR			= $(SRC_DIR)/..
GENERIC_DIR		= $(TOP_DIR)/generic
TTK_DIR			= $(GENERIC_DIR)/ttk
UNIX_DIR		= $(TOP_DIR)/unix
BMAP_DIR		= $(TOP_DIR)/bitmaps
TOOL_DIR		= @@TCL_SRC_DIR@@/tools
TEST_DIR		= $(TOP_DIR)/tests
MAC_OSX_DIR		= $(TOP_DIR)/@@MACOSX_SRC_DIR@@
XLIB_DIR		= $(TOP_DIR)/xlib

#----------------------------------------------------------------
# The information below should be usable as is.  The configure
# script won't modify it and you shouldn't need to modify it
# either.
#----------------------------------------------------------------

# Flags to be passed to installManPage to control how the manpages
# should be installed (symlinks, compression, package name suffix).
MAN_FLAGS               = @@MAN_FLAGS@@

CC			= @@CC@@

CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
-I${TCL_PLATFORM_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} ${AC_FLAGS} \
${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
${NO_DEPRECATED_FLAGS} @@EXTRA_CC_SWITCHES@@

CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @@TCL_STUB_FLAGS@@

APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @@EXTRA_APP_CC_SWITCHES@@

DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
${KEYSYM_FLAGS} @@EXTRA_CC_SWITCHES@@

WISH_OBJS = tkAppInit.o

TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o tkOldTest.o \
	$(@@TK_WINDOWINGSYSTEM@@_TKTEST_OBJS)

WIDG_OBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \
	tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \
	tkPanedWindow.o tkScale.o tkScrollbar.o

CANV_OBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvImg.o \
	tkCanvLine.o tkCanvPoly.o tkCanvPs.o tkCanvText.o \
	tkCanvUtil.o tkCanvWind.o tkRectOval.o tkTrig.o

IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPNG.o tkImgPPM.o \
	tkImgPhoto.o tkImgPhInstance.o

TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \
	tkTextMark.o tkTextTag.o tkTextWind.o

# either tkUnixFont.o (default) or tkUnixRFont.o (if --enable-xft)
# 
FONT_OBJS = @@UNIX_FONT_OBJS@@

GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkBusy.o \
	tkClipboard.o \
	tkCmds.o tkColor.o tkConfig.o tkConsole.o tkCursor.o tkError.o \
	tkEvent.o tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o \
	tkGrid.o tkMain.o tkObj.o tkOldConfig.o tkOption.o tkPack.o tkPlace.o \
	tkSelect.o tkStyle.o tkUndo.o tkUtil.o tkVisual.o tkWindow.o

TTK_OBJS = \
	ttkBlink.o ttkButton.o ttkCache.o ttkClamTheme.o ttkClassicTheme.o \
	ttkDefaultTheme.o ttkElements.o ttkEntry.o ttkFrame.o ttkImage.o \
	ttkInit.o ttkLabel.o ttkLayout.o ttkManager.o ttkNotebook.o \
	ttkPanedwindow.o ttkProgress.o ttkScale.o ttkScrollbar.o ttkScroll.o \
	ttkSeparator.o ttkSquare.o ttkState.o \
	ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \
	ttkWidget.o ttkStubInit.o

STUB_OBJS = tkStubInit.o

STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o

X11_OBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \
	tkUnixCursor.o tkUnixDraw.o tkUnixEmbed.o tkUnixEvent.o \
	tkUnixFocus.o  $(FONT_OBJS) tkUnixInit.o tkUnixKey.o tkUnixMenu.o \
	tkUnixMenubu.o tkUnixScale.o tkUnixScrlbr.o tkUnixSelect.o \
	tkUnixSend.o tkUnixWm.o tkUnixXId.o

AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
	tkMacOSXColor.o tkMacOSXConfig.o tkMacOSXCursor.o tkMacOSXDebug.o \
	tkMacOSXDialog.o tkMacOSXDraw.o tkMacOSXEmbed.o tkMacOSXEntry.o \
	tkMacOSXEvent.o tkMacOSXFont.o tkMacOSXHLEvents.o tkMacOSXInit.o \
	tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \
	tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \
	tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \
	tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \
	tkMacOSXWm.o tkMacOSXXStubs.o @@EXTRA_AQUA_OBJS@@ \
	tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \
	xcolors.o xdraw.o xgc.o ximage.o xutil.o \
	ttkMacOSXTheme.o

AQUA_TKTEST_OBJS = tkMacOSXTest.o

OBJS =  $(GENERIC_OBJS) $(WIDG_OBJS) $(CANV_OBJS) $(IMAGE_OBJS) $(TEXT_OBJS) \
	$(STUB_OBJS) $(TTK_OBJS) \
	$(@@TK_WINDOWINGSYSTEM@@_OBJS) @@PLAT_OBJS@@

TK_DECLS = \
	$(GENERIC_DIR)/tk.decls \
	$(GENERIC_DIR)/tkInt.decls

TTK_DECLS = \
	$(TTK_DIR)/ttk.decls

GENERIC_SRCS = \
	$(GENERIC_DIR)/tk3d.c $(GENERIC_DIR)/tkArgv.c \
	$(GENERIC_DIR)/tkAtom.c $(GENERIC_DIR)/tkBind.c	\
	$(GENERIC_DIR)/tkBitmap.c $(GENERIC_DIR)/tkBusy.c \
	$(GENERIC_DIR)/tkClipboard.c \
	$(GENERIC_DIR)/tkCmds.c $(GENERIC_DIR)/tkColor.c \
	$(GENERIC_DIR)/tkConfig.c $(GENERIC_DIR)/tkCursor.c \
	$(GENERIC_DIR)/tkError.c $(GENERIC_DIR)/tkEvent.c \
	$(GENERIC_DIR)/tkFocus.c $(GENERIC_DIR)/tkFont.c \
	$(GENERIC_DIR)/tkGet.c $(GENERIC_DIR)/tkGC.c \
	$(GENERIC_DIR)/tkGeometry.c $(GENERIC_DIR)/tkGrab.c \
	$(GENERIC_DIR)/tkGrid.c $(GENERIC_DIR)/tkConsole.c \
	$(GENERIC_DIR)/tkMain.c $(GENERIC_DIR)/tkOption.c \
	$(GENERIC_DIR)/tkPack.c $(GENERIC_DIR)/tkPlace.c \
	$(GENERIC_DIR)/tkSelect.c $(GENERIC_DIR)/tkStyle.c \
	$(GENERIC_DIR)/tkUndo.c $(GENERIC_DIR)/tkUtil.c \
	$(GENERIC_DIR)/tkVisual.c $(GENERIC_DIR)/tkWindow.c \
	$(GENERIC_DIR)/tkButton.c $(GENERIC_DIR)/tkObj.c \
	$(GENERIC_DIR)/tkEntry.c $(GENERIC_DIR)/tkFrame.c \
	$(GENERIC_DIR)/tkListbox.c $(GENERIC_DIR)/tkMenu.c \
	$(GENERIC_DIR)/tkMenubutton.c $(GENERIC_DIR)/tkMenuDraw.c \
	$(GENERIC_DIR)/tkMessage.c $(GENERIC_DIR)/tkPanedWindow.c \
	$(GENERIC_DIR)/tkScale.c $(GENERIC_DIR)/tkScrollbar.c \
	$(GENERIC_DIR)/tkCanvas.c $(GENERIC_DIR)/tkCanvArc.c \
	$(GENERIC_DIR)/tkCanvBmap.c $(GENERIC_DIR)/tkCanvImg.c \
	$(GENERIC_DIR)/tkCanvLine.c $(GENERIC_DIR)/tkCanvPoly.c \
	$(GENERIC_DIR)/tkCanvPs.c $(GENERIC_DIR)/tkCanvText.c \
	$(GENERIC_DIR)/tkCanvUtil.c \
	$(GENERIC_DIR)/tkCanvWind.c $(GENERIC_DIR)/tkRectOval.c \
	$(GENERIC_DIR)/tkTrig.c $(GENERIC_DIR)/tkImage.c \
	$(GENERIC_DIR)/tkImgBmap.c $(GENERIC_DIR)/tkImgGIF.c \
	$(GENERIC_DIR)/tkImgPNG.c $(GENERIC_DIR)/tkImgPPM.c \
	$(GENERIC_DIR)/tkImgPhoto.c $(GENERIC_DIR)/tkImgPhInstance.c \
	$(GENERIC_DIR)/tkText.c \
	$(GENERIC_DIR)/tkTextBTree.c $(GENERIC_DIR)/tkTextDisp.c \
	$(GENERIC_DIR)/tkTextImage.c \
	$(GENERIC_DIR)/tkTextIndex.c $(GENERIC_DIR)/tkTextMark.c \
	$(GENERIC_DIR)/tkTextTag.c $(GENERIC_DIR)/tkTextWind.c \
	$(GENERIC_DIR)/tkOldConfig.c $(GENERIC_DIR)/tkOldTest.c \
	$(GENERIC_DIR)/tkSquare.c $(GENERIC_DIR)/tkTest.c \
	$(GENERIC_DIR)/tkStubInit.c

TTK_SRCS = \
	$(TTK_DIR)/ttkBlink.c \
	$(TTK_DIR)/ttkButton.c \
	$(TTK_DIR)/ttkCache.c \
	$(TTK_DIR)/ttkClamTheme.c \
	$(TTK_DIR)/ttkClassicTheme.c \
	$(TTK_DIR)/ttkDefaultTheme.c \
	$(TTK_DIR)/ttkElements.c \
	$(TTK_DIR)/ttkEntry.c \
	$(TTK_DIR)/ttkFrame.c \
	$(TTK_DIR)/ttkImage.c \
	$(TTK_DIR)/ttkInit.c \
	$(TTK_DIR)/ttkLabel.c \
	$(TTK_DIR)/ttkLayout.c \
	$(TTK_DIR)/ttkManager.c \
	$(TTK_DIR)/ttkNotebook.c \
	$(TTK_DIR)/ttkPanedwindow.c \
	$(TTK_DIR)/ttkProgress.c \
	$(TTK_DIR)/ttkScale.c \
	$(TTK_DIR)/ttkScrollbar.c \
	$(TTK_DIR)/ttkScroll.c \
	$(TTK_DIR)/ttkSeparator.c \
	$(TTK_DIR)/ttkSquare.c \
	$(TTK_DIR)/ttkState.c \
	$(TTK_DIR)/ttkTagSet.c \
	$(TTK_DIR)/ttkTheme.c \
	$(TTK_DIR)/ttkTrace.c \
	$(TTK_DIR)/ttkTrack.c \
	$(TTK_DIR)/ttkTreeview.c \
	$(TTK_DIR)/ttkWidget.c

TTK_STUB_SRCS = \
	$(TTK_DIR)/ttkStubInit.c $(TTK_DIR)/ttkStubLib.c

X11_SRCS = \
	$(UNIX_DIR)/tkAppInit.c $(UNIX_DIR)/tkUnix.c \
	$(UNIX_DIR)/tkUnix3d.c \
	$(UNIX_DIR)/tkUnixButton.c $(UNIX_DIR)/tkUnixColor.c \
	$(UNIX_DIR)/tkUnixConfig.c \
	$(UNIX_DIR)/tkUnixCursor.c \
	$(UNIX_DIR)/tkUnixDraw.c \
	$(UNIX_DIR)/tkUnixEmbed.c $(UNIX_DIR)/tkUnixEvent.c \
	$(UNIX_DIR)/tkUnixFocus.c \
	$(UNIX_DIR)/tkUnixRFont.c \
	$(UNIX_DIR)/tkUnixFont.c $(UNIX_DIR)/tkUnixInit.c \
	$(UNIX_DIR)/tkUnixKey.c \
	$(UNIX_DIR)/tkUnixMenu.c $(UNIX_DIR)/tkUnixMenubu.c \
	$(UNIX_DIR)/tkUnixScale.c $(UNIX_DIR)/tkUnixScrlbr.c \
	$(UNIX_DIR)/tkUnixSelect.c \
	$(UNIX_DIR)/tkUnixSend.c $(UNIX_DIR)/tkUnixWm.c \
	$(UNIX_DIR)/tkUnixXId.c

AQUA_SRCS = \
	$(MAC_OSX_DIR)/tkMacOSXBitmap.c $(MAC_OSX_DIR)/tkMacOSXButton.c \
	$(MAC_OSX_DIR)/tkMacOSXClipboard.c $(MAC_OSX_DIR)/tkMacOSXColor.c \
	$(MAC_OSX_DIR)/tkMacOSXConfig.c $(MAC_OSX_DIR)/tkMacOSXCursor.c \
	$(MAC_OSX_DIR)/tkMacOSXDebug.c $(MAC_OSX_DIR)/tkMacOSXDialog.c \
	$(MAC_OSX_DIR)/tkMacOSXDraw.c $(MAC_OSX_DIR)/tkMacOSXEmbed.c \
	$(MAC_OSX_DIR)/tkMacOSXEntry.c $(MAC_OSX_DIR)/tkMacOSXEvent.c \
	$(MAC_OSX_DIR)/tkMacOSXFont.c $(MAC_OSX_DIR)/tkMacOSXHLEvents.c \
	$(MAC_OSX_DIR)/tkMacOSXInit.c $(MAC_OSX_DIR)/tkMacOSXKeyboard.c \
	$(MAC_OSX_DIR)/tkMacOSXKeyEvent.c $(MAC_OSX_DIR)/tkMacOSXMenu.c \
	$(MAC_OSX_DIR)/tkMacOSXMenubutton.c $(MAC_OSX_DIR)/tkMacOSXMenus.c \
	$(MAC_OSX_DIR)/tkMacOSXMouseEvent.c $(MAC_OSX_DIR)/tkMacOSXNotify.c \
	$(MAC_OSX_DIR)/tkMacOSXRegion.c $(MAC_OSX_DIR)/tkMacOSXScrlbr.c \
	$(MAC_OSX_DIR)/tkMacOSXSend.c $(MAC_OSX_DIR)/tkMacOSXSubwindows.c \
	$(MAC_OSX_DIR)/tkMacOSXTest.c $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c \
	$(MAC_OSX_DIR)/tkMacOSXWm.c $(MAC_OSX_DIR)/tkMacOSXXStubs.c \
	@@EXTRA_AQUA_SRCS@@ \
	$(GENERIC_DIR)/tkFileFilter.c $(GENERIC_DIR)/tkMacWinMenu.c \
	$(GENERIC_DIR)/tkPointer.c $(UNIX_DIR)/tkUnix3d.c \
	$(UNIX_DIR)/tkUnixScale.c $(XLIB_DIR)/xcolors.c $(XLIB_DIR)/xdraw.c \
	$(XLIB_DIR)/xgc.c $(XLIB_DIR)/ximage.c $(XLIB_DIR)/xutil.c \
	$(TTK_DIR)/ttkMacOSXTheme.c

SRCS = $(GENERIC_SRCS) $(@@TK_WINDOWINGSYSTEM@@_SRCS) @@PLAT_SRCS@@

AQUA_RESOURCES = \
	$(MAC_OSX_DIR)/tkAboutDlg.r $(MAC_OSX_DIR)/tkMacOSXCursors.r \
	$(MAC_OSX_DIR)/tkMacOSXXCursors.r

AQUA_WISH_RESOURCES = $(MAC_OSX_DIR)/tkMacOSXAETE.r

AQUA_HDRS = $(MAC_OSX_DIR)/tkMacOSX.h $(GENERIC_DIR)/tkIntXlibDecls.h

AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbytes.h

AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h

X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h

# Currently private, eventually public
TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h

PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
	$(GENERIC_DIR)/tkPlatDecls.h $(@@TK_WINDOWINGSYSTEM@@_HDRS)

# The private headers we want installed for install-private-headers
PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
	$(TTK_HDRS) $(@@TK_WINDOWINGSYSTEM@@_PRIVATE_HDRS)

DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget

SHELL_ENV = \
	@@LD_LIBRARY_PATH_VAR@@="`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}"; \
	export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY;

all: binaries libraries doc

binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${WISH_EXE}

libraries:

$(TOP_DIR)/doc/man.macros:
	$(INSTALL_DATA) @@TCL_SRC_DIR@@/doc/man.macros $(TOP_DIR)/doc/man.macros

doc: $(TOP_DIR)/doc/man.macros

# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tk.
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @@LIB_RSRC_FILE@@
	rm -f $@@
	@@MAKE_LIB@@

${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
	rm -f $@@
	@@MAKE_STUB_LIB@@

# Build Aqua resource files
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
	rm -f $@@
	if test "$(REZ)" != ""; then \
	    $(REZ) -o $@@ $(REZ_SWITCHES) $(AQUA_RESOURCES); fi

${WISH_RSRC_FILE}: $(AQUA_WISH_RESOURCES)
	rm -f $@@
	if test "$(REZ)" != ""; then \
	    $(REZ) -o $@@ $(REZ_SWITCHES) $(AQUA_WISH_RESOURCES); fi

# Make target which outputs the list of the .o contained in the Tk lib
# usefull to build a single big shared library containing Tcl/Tk and other
# extensions.  used for the Tcl Plugin.  -- dl
tkLibObjs:
	@@echo ${OBJS}
# This targets actually build the objects needed for the lib in the above
# case
objs: ${OBJS}


${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @@APP_RSRC_FILE@@
	${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @@TK_BUILD_LIB_SPEC@@ \
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE}

# Resetting the LIB_RUNTIME_DIR below is required so that
# the generated tktest executable gets the build directory
# burned into its ld search path. This keeps tktest from
# picking up an already installed version of the Tcl or
# Tk shared libraries.

tktest${EXE_SUFFIX}: $(TKTEST_OBJS) $(TK_LIB_FILE)
	$(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)"

tktest-real: ${TK_STUB_LIB_FILE}
	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} @@TK_BUILD_LIB_SPEC@@ \
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest${EXE_SUFFIX}

# # FIXME: This xttest rule seems to be broken in a number of ways.  It should
# # use CC_SEARCH_FLAGS, it does not include the shared lib location logic from
# # tktest, and it is not clear where this test.o object file comes from.
# 
# xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) ${TK_STUB_LIB_FILE}
# 	${CC} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
# 		@@TK_BUILD_LIB_SPEC@@ ${TK_STUB_LIB_FILE}  ${TCL_STUB_LIB_SPEC} \
# 		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest

# Note, in the target below TCL_LIBRARY needs to be set or else
# "make test" won't work in the case where the compilation directory
# isn't the same as the source directory.
# Specifying TESTFLAGS on the command line is the standard way to pass
# args to tcltest, ie:
#	% make test TESTFLAGS="-verbose bps -file fileName.test"

test: test-classic test-ttk

test-classic: tktest${EXE_SUFFIX}
	$(SHELL_ENV) ./tktest${EXE_SUFFIX} $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)

test-ttk: tktest${EXE_SUFFIX}
	$(SHELL_ENV) ./tktest${EXE_SUFFIX} $(TEST_DIR)/ttk/all.tcl -geometry +0+0 \
	$(TESTFLAGS)

# Tests with different languages
testlang: tktest${EXE_SUFFIX}
	$(SHELL_ENV) \
	for lang in $(LOCALES) ;  \
	do \
	LANG=$(lang); export LANG; \
	./tktest${EXE_SUFFIX} $(TEST_DIR)/all.tcl -geometry +0+0 \
	$(TESTFLAGS); \
	done

# Useful target to launch a built tktest with the proper path,...
runtest: tktest${EXE_SUFFIX}
	$(SHELL_ENV) ./tktest${EXE_SUFFIX}

# This target can be used to run wish from the build directory
# via `make shell` or `make shell SCRIPT=/tmp/foo.tcl`
shell: ${WISH_EXE}
	$(SHELL_ENV) ./${WISH_EXE} $(SCRIPT)

demo:
	$(SHELL_ENV) ./${WISH_EXE} $(TOP_DIR)/library/demos/widget

# This target can be used to run wish inside either gdb or insight
gdb: ${WISH_EXE}
	@@echo "set env @@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}" > gdb.run
	@@echo "set env TCL_LIBRARY=@@TCL_SRC_DIR@@/library" >> gdb.run
	@@echo "set env TK_LIBRARY=@@TK_SRC_DIR@@/library" >> gdb.run
	gdb ./${WISH_EXE} --command=gdb.run
	rm gdb.run

VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v

valgrind: tktest@@EXEEXT@@
	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest${EXE_SUFFIX} $(TEST_DIR)/all.tcl -geometry +0+0 -singleproc 1 $(TESTFLAGS)

valgrindshell: tktest@@EXEEXT@@
	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest${EXE_SUFFIX} $(SCRIPT)

INSTALL_BASE_TARGETS = install-binaries install-libraries
INSTALL_DOC_TARGETS = install-doc
INSTALL_DEV_TARGETS = install-headers
INSTALL_DEMO_TARGETS = install-demos
INSTALL_EXTRA_TARGETS = @@EXTRA_INSTALL@@
INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)

install: $(INSTALL_TARGETS)

install-strip:
	$(MAKE) $(INSTALL_TARGETS) \
		INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \
		INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}"

# Note: before running ranlib below, must cd to target directory because
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).

install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
	@@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
	    do \
	    if [ ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \
		$(INSTALL_DATA_DIR) "$$i"; \
		else true; \
		fi; \
	    done;
	@@if test "x$(TK_SHARED_BUILD)" = "x1"; then \
	    echo "Creating package index $(PKG_INDEX)"; \
	    rm -f "$(PKG_INDEX)"; \
	    (\
	    echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\
	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
	    ) > "$(PKG_INDEX)"; \
	    fi
	@@echo "Installing $(LIB_FILE) to @@DLL_INSTALL_DIR@@/"
	@@@@INSTALL_LIB@@
	@@chmod 555 "@@DLL_INSTALL_DIR@@"/$(LIB_FILE)
	@@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
	@@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)"/wish$(VERSION)${EXE_SUFFIX}
	@@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
	@@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tkConfig.sh
	@@if test "$(STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
	    @@INSTALL_STUB_LIB@@ ; \
	fi
	@@EXTRA_INSTALL_BINARIES@@
	@@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
	@@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
	@@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc

install-libraries: libraries
	@@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
		"$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
	    do \
	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \
		$(INSTALL_DATA_DIR) "$$i"; \
		else true; \
		fi; \
	    done;
	@@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
	@@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
		$(UNIX_DIR)/tkAppInit.c; \
	    do \
	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
	    done;
	@@echo "Installing library ttk files to $(SCRIPT_INSTALL_DIR)/ttk/";
	@@for i in $(TOP_DIR)/library/ttk/*.tcl; \
	    do \
	    if [ -f $$i ] ; then \
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/ttk; \
	    fi; \
	    done;
	@@echo "Installing library image files to $(SCRIPT_INSTALL_DIR)/images/";
	@@for i in $(TOP_DIR)/library/images/*; \
	    do \
	    if [ -f $$i ] ; then \
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/images; \
	    fi; \
	    done;
	@@echo "Installing message catalog files to $(SCRIPT_INSTALL_DIR)/msgs/";
	@@for i in $(TOP_DIR)/library/msgs/*.msg; \
	    do \
	    if [ -f $$i ] ; then \
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/msgs; \
	    fi; \
	    done;

install-demos:
	@@for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)"/images ; \
	    do \
	    if [ ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \
		$(INSTALL_DATA_DIR) "$$i"; \
		else true; \
		fi; \
	    done;
	@@echo "Installing demo files to $(DEMO_INSTALL_DIR)/";
	@@for i in $(TOP_DIR)/library/demos/*; \
	    do \
	    if [ -f $$i ] ; then \
		sed -e '3 s|exec wish|exec wish$(VERSION)|' \
			$$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
	    fi; \
	    done;
	@@for i in $(DEMOPROGS); \
	    do \
	    chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \
	    done;
	@@echo "Installing demo images to $(DEMO_INSTALL_DIR)/images/";
	@@for i in $(TOP_DIR)/library/demos/images/*; \
	    do \
	    if [ -f $$i ] ; then \
		$(INSTALL_DATA) $$i "$(DEMO_INSTALL_DIR)"/images; \
		fi; \
	    done;

install-doc:
	@@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
	    do \
	    if [ ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \
		$(INSTALL_DATA_DIR) "$$i"; \
		else true; \
		fi; \
	    done;
	@@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
	@@for i in $(TOP_DIR)/doc/*.1; do \
	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
	done
	@@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
	@@for i in $(TOP_DIR)/doc/*.3; do \
	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
	done
	@@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
	@@for i in $(TOP_DIR)/doc/*.n; do \
	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
	done

install-headers:
	@@if test "$(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS)" != ""; then \
	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
	    do \
	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \
		$(INSTALL_DATA_DIR) "$$i"; \
		else true; \
		fi; \
	    done;
	@@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
	@@for i in $(PUBLIC_HDRS); \
	    do \
	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
	    done;
	@@list='$(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS)'; for i in $$list ; \
	    do \
	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
	    done;

# Optional target to install private headers
install-private-headers:
	@@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
	    do \
	    if [ ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \
		$(INSTALL_DATA_DIR) "$$i"; \
		else true; \
		fi; \
	    done;
	@@echo "Installing private header files to $(PRIVATE_INCLUDE_INSTALL_DIR)/";
	@@for i in $(PRIVATE_HDRS); \
	    do \
	    $(INSTALL_DATA) $$i "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
	    done;
	@@if test -f tkConfig.h; then\
	    $(INSTALL_DATA) tkConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
	    fi;

Makefile: $(UNIX_DIR)/Makefile.in
	$(SHELL) config.status
#tkConfig.h: $(UNIX_DIR)/tkConfig.h.in
#	$(SHELL) config.status

clean:
	rm -f *.a *.o libtk* core errs *~ \#* TAGS *.E a.out \
		errors ${WISH_EXE} tktest${EXE_SUFFIX} lib.exp Tk *.rsrc

distclean: clean
	rm -rf Makefile config.status config.cache config.log tkConfig.sh \
		tkConfig.h *.plist Tk.framework tk.pc

depend:
	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)

# Test binaries.  The rule for tkTestInit.o is complicated because
# it is is compiled from tkAppInit.c.  Can't use the "-o" option
# because this doesn't work on some strange compilers (e.g. UnixWare).
# To enable concurrent parallel make of wish and tktest, this target has to
# depend on wish, this ensures that linking of wish with tkTestInit.o does not
# execute concurrently with the renaming and recompiling of that same object
# file in the target below.

tkTestInit.o: $(UNIX_DIR)/tkAppInit.c ${WISH_EXE}
	@@if test -f tkAppInit.o ; then \
	    rm -f tkAppInit.sav; \
	    mv tkAppInit.o tkAppInit.sav; \
	fi;
	$(CC) -c $(APP_CC_SWITCHES) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
	rm -f tkTestInit.o
	mv tkAppInit.o tkTestInit.o
	@@if test -f tkAppInit.sav ; then \
	    mv tkAppInit.sav tkAppInit.o; \
	fi;

tkAppInit.o: $(UNIX_DIR)/tkAppInit.c
	$(CC) -c $(APP_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c

tk3d.o: $(GENERIC_DIR)/tk3d.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tk3d.c

tkArgv.o: $(GENERIC_DIR)/tkArgv.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkArgv.c

tkAtom.o: $(GENERIC_DIR)/tkAtom.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkAtom.c

tkBind.o: $(GENERIC_DIR)/tkBind.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBind.c

tkBitmap.o: $(GENERIC_DIR)/tkBitmap.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBitmap.c

tkBusy.o: $(GENERIC_DIR)/tkBusy.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkBusy.c

tkClipboard.o: $(GENERIC_DIR)/tkClipboard.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkClipboard.c

tkCmds.o: $(GENERIC_DIR)/tkCmds.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCmds.c

tkColor.o: $(GENERIC_DIR)/tkColor.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkColor.c

tkConfig.o: $(GENERIC_DIR)/tkConfig.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkConfig.c

tkConsole.o: $(GENERIC_DIR)/tkConsole.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkConsole.c

tkCursor.o: $(GENERIC_DIR)/tkCursor.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCursor.c

tkError.o: $(GENERIC_DIR)/tkError.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkError.c

tkEvent.o: $(GENERIC_DIR)/tkEvent.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkEvent.c

tkFocus.o: $(GENERIC_DIR)/tkFocus.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFocus.c

tkFont.o: $(GENERIC_DIR)/tkFont.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFont.c

tkGet.o: $(GENERIC_DIR)/tkGet.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGet.c

tkGC.o: $(GENERIC_DIR)/tkGC.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGC.c

tkGeometry.o: $(GENERIC_DIR)/tkGeometry.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGeometry.c

tkGrab.o: $(GENERIC_DIR)/tkGrab.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGrab.c

tkGrid.o: $(GENERIC_DIR)/tkGrid.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkGrid.c

tkMain.o: $(GENERIC_DIR)/tkMain.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMain.c

tkObj.o: $(GENERIC_DIR)/tkObj.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkObj.c

tkOldConfig.o: $(GENERIC_DIR)/tkOldConfig.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkOldConfig.c

tkOption.o: $(GENERIC_DIR)/tkOption.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkOption.c

tkPack.o: $(GENERIC_DIR)/tkPack.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPack.c

tkPlace.o: $(GENERIC_DIR)/tkPlace.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPlace.c

tkSelect.o: $(GENERIC_DIR)/tkSelect.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkSelect.c

tkStyle.o: $(GENERIC_DIR)/tkStyle.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStyle.c

tkUtil.o: $(GENERIC_DIR)/tkUtil.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkUtil.c

tkVisual.o: $(GENERIC_DIR)/tkVisual.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c

tkWindow.o: $(GENERIC_DIR)/tkWindow.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c

tkButton.o: $(GENERIC_DIR)/tkButton.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c

tkEntry.o: $(GENERIC_DIR)/tkEntry.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkEntry.c

tkFrame.o: $(GENERIC_DIR)/tkFrame.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFrame.c

tkListbox.o: $(GENERIC_DIR)/tkListbox.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkListbox.c

tkMenu.o: $(GENERIC_DIR)/tkMenu.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenu.c

tkMenubutton.o: $(GENERIC_DIR)/tkMenubutton.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenubutton.c

tkMenuDraw.o: $(GENERIC_DIR)/tkMenuDraw.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMenuDraw.c

tkMessage.o: $(GENERIC_DIR)/tkMessage.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMessage.c

tkPanedWindow.o: $(GENERIC_DIR)/tkPanedWindow.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPanedWindow.c

tkScale.o: $(GENERIC_DIR)/tkScale.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkScale.c

tkScrollbar.o: $(GENERIC_DIR)/tkScrollbar.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkScrollbar.c

tkSquare.o: $(GENERIC_DIR)/tkSquare.c
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkSquare.c

tkCanvas.o: $(GENERIC_DIR)/tkCanvas.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvas.c

tkCanvArc.o: $(GENERIC_DIR)/tkCanvArc.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvArc.c

tkCanvBmap.o: $(GENERIC_DIR)/tkCanvBmap.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvBmap.c

tkCanvImg.o: $(GENERIC_DIR)/tkCanvImg.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvImg.c

tkCanvLine.o: $(GENERIC_DIR)/tkCanvLine.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvLine.c

tkCanvPoly.o: $(GENERIC_DIR)/tkCanvPoly.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvPoly.c

tkCanvPs.o: $(GENERIC_DIR)/tkCanvPs.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvPs.c

tkCanvText.o: $(GENERIC_DIR)/tkCanvText.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvText.c

tkCanvUtil.o: $(GENERIC_DIR)/tkCanvUtil.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvUtil.c

tkCanvWind.o: $(GENERIC_DIR)/tkCanvWind.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkCanvWind.c

tkRectOval.o: $(GENERIC_DIR)/tkRectOval.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkRectOval.c

tkTrig.o: $(GENERIC_DIR)/tkTrig.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTrig.c

tkImage.o: $(GENERIC_DIR)/tkImage.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImage.c

tkImgBmap.o: $(GENERIC_DIR)/tkImgBmap.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgBmap.c

tkImgGIF.o: $(GENERIC_DIR)/tkImgGIF.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgGIF.c

tkImgPNG.o: $(GENERIC_DIR)/tkImgPNG.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPNG.c

tkImgPPM.o: $(GENERIC_DIR)/tkImgPPM.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPPM.c

tkImgPhoto.o: $(GENERIC_DIR)/tkImgPhoto.c $(GENERIC_DIR)/tkImgPhoto.h
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPhoto.c

tkImgPhInstance.o: $(GENERIC_DIR)/tkImgPhInstance.c $(GENERIC_DIR)/tkImgPhoto.h
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPhInstance.c

tkOldTest.o: $(GENERIC_DIR)/tkOldTest.c
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkOldTest.c

tkTest.o: $(GENERIC_DIR)/tkTest.c
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkTest.c

tkText.o: $(GENERIC_DIR)/tkText.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkText.c

tkTextBTree.o: $(GENERIC_DIR)/tkTextBTree.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextBTree.c

tkTextDisp.o: $(GENERIC_DIR)/tkTextDisp.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextDisp.c

tkTextImage.o: $(GENERIC_DIR)/tkTextImage.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextImage.c

tkTextIndex.o: $(GENERIC_DIR)/tkTextIndex.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextIndex.c

tkTextMark.o: $(GENERIC_DIR)/tkTextMark.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextMark.c

tkTextTag.o: $(GENERIC_DIR)/tkTextTag.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextTag.c

tkTextWind.o: $(GENERIC_DIR)/tkTextWind.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTextWind.c

tkStubInit.o: $(GENERIC_DIR)/tkStubInit.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubInit.c

# Stub library binaries, these must be compiled for use in a shared library
# even though they will be placed in a static archive

tkStubLib.o: $(GENERIC_DIR)/tkStubLib.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubLib.c

tkUndo.o: $(GENERIC_DIR)/tkUndo.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkUndo.c

tkUnix.o: $(UNIX_DIR)/tkUnix.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnix.c

tkUnix3d.o: $(UNIX_DIR)/tkUnix3d.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnix3d.c

tkUnixButton.o: $(UNIX_DIR)/tkUnixButton.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixButton.c

tkUnixColor.o: $(UNIX_DIR)/tkUnixColor.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixColor.c

tkUnixConfig.o: $(UNIX_DIR)/tkUnixConfig.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixConfig.c

tkUnixCursor.o: $(UNIX_DIR)/tkUnixCursor.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixCursor.c

tkUnixDraw.o: $(UNIX_DIR)/tkUnixDraw.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixDraw.c

tkUnixEmbed.o: $(UNIX_DIR)/tkUnixEmbed.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEmbed.c

tkUnixEvent.o: $(UNIX_DIR)/tkUnixEvent.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEvent.c

tkUnixFocus.o: $(UNIX_DIR)/tkUnixFocus.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFocus.c

tkUnixFont.o: $(UNIX_DIR)/tkUnixFont.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFont.c

# NB: tkUnixRFont.o uses nondefault CFLAGS
tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c
	$(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c

tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
	    $(UNIX_DIR)/tkUnixInit.c

tkUnixKey.o: $(UNIX_DIR)/tkUnixKey.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixKey.c

tkUnixMenu.o: $(UNIX_DIR)/tkUnixMenu.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixMenu.c

tkUnixMenubu.o: $(UNIX_DIR)/tkUnixMenubu.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixMenubu.c

tkUnixScale.o: $(UNIX_DIR)/tkUnixScale.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixScale.c

tkUnixScrlbr.o: $(UNIX_DIR)/tkUnixScrlbr.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixScrlbr.c

tkUnixSelect.o: $(UNIX_DIR)/tkUnixSelect.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixSelect.c

tkUnixSend.o: $(UNIX_DIR)/tkUnixSend.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixSend.c

tkUnixWm.o: $(UNIX_DIR)/tkUnixWm.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixWm.c

tkUnixXId.o: $(UNIX_DIR)/tkUnixXId.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixXId.c

tkMacOSXBitmap.o: $(MAC_OSX_DIR)/tkMacOSXBitmap.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXBitmap.c

tkMacOSXButton.o: $(MAC_OSX_DIR)/tkMacOSXButton.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXButton.c

tkMacOSXClipboard.o: $(MAC_OSX_DIR)/tkMacOSXClipboard.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXClipboard.c

tkMacOSXColor.o: $(MAC_OSX_DIR)/tkMacOSXColor.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXColor.c

tkMacOSXConfig.o: $(MAC_OSX_DIR)/tkMacOSXConfig.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXConfig.c

tkMacOSXCursor.o: $(MAC_OSX_DIR)/tkMacOSXCursor.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXCursor.c

tkMacOSXDebug.o: $(MAC_OSX_DIR)/tkMacOSXDebug.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXDebug.c

tkMacOSXDialog.o: $(MAC_OSX_DIR)/tkMacOSXDialog.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXDialog.c

tkMacOSXDraw.o: $(MAC_OSX_DIR)/tkMacOSXDraw.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXDraw.c

tkMacOSXEmbed.o: $(MAC_OSX_DIR)/tkMacOSXEmbed.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEmbed.c

tkMacOSXEntry.o: $(MAC_OSX_DIR)/tkMacOSXEntry.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEntry.c

tkMacOSXEvent.o: $(MAC_OSX_DIR)/tkMacOSXEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEvent.c

tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXFont.c

tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c

tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
	    $(MAC_OSX_DIR)/tkMacOSXInit.c

tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXKeyboard.c

tkMacOSXKeyEvent.o: $(MAC_OSX_DIR)/tkMacOSXKeyEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXKeyEvent.c

tkMacOSXMenu.o: $(MAC_OSX_DIR)/tkMacOSXMenu.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMenu.c

tkMacOSXMenubutton.o: $(MAC_OSX_DIR)/tkMacOSXMenubutton.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMenubutton.c

tkMacOSXMenus.o: $(MAC_OSX_DIR)/tkMacOSXMenus.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMenus.c

tkMacOSXMouseEvent.o: $(MAC_OSX_DIR)/tkMacOSXMouseEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMouseEvent.c

tkMacOSXNotify.o: $(MAC_OSX_DIR)/tkMacOSXNotify.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXNotify.c

tkMacOSXRegion.o: $(MAC_OSX_DIR)/tkMacOSXRegion.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXRegion.c

tkMacOSXScale.o: $(MAC_OSX_DIR)/tkMacOSXScale.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXScale.c

tkMacOSXScrlbr.o: $(MAC_OSX_DIR)/tkMacOSXScrlbr.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXScrlbr.c

tkMacOSXSend.o: $(MAC_OSX_DIR)/tkMacOSXSend.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSend.c

tkMacOSXSubwindows.o: $(MAC_OSX_DIR)/tkMacOSXSubwindows.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSubwindows.c

tkMacOSXTest.o: $(MAC_OSX_DIR)/tkMacOSXTest.c
	$(CC) -c $(APP_CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXTest.c

tkMacOSXWindowEvent.o: $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c

tkMacOSXWm.o: $(MAC_OSX_DIR)/tkMacOSXWm.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXWm.c

tkMacOSXXStubs.o: $(MAC_OSX_DIR)/tkMacOSXXStubs.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXXStubs.c

tkMacOSXCarbonEvents.o: $(TOP_DIR)/carbon/tkMacOSXCarbonEvents.c
	$(CC) -c $(CC_SWITCHES) $(TOP_DIR)/carbon/tkMacOSXCarbonEvents.c

tkFileFilter.o: $(GENERIC_DIR)/tkFileFilter.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFileFilter.c

tkMacWinMenu.o: $(GENERIC_DIR)/tkMacWinMenu.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMacWinMenu.c

tkPointer.o: $(GENERIC_DIR)/tkPointer.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPointer.c

xcolors.o: $(XLIB_DIR)/xcolors.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xcolors.c

xdraw.o: $(XLIB_DIR)/xdraw.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xdraw.c

xgc.o: $(XLIB_DIR)/xgc.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xgc.c

ximage.o: $(XLIB_DIR)/ximage.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/ximage.c

xutil.o: $(XLIB_DIR)/xutil.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xutil.c

ttkBlink.o: $(TTK_DIR)/ttkBlink.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkBlink.c

ttkButton.o: $(TTK_DIR)/ttkButton.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkButton.c

ttkCache.o: $(TTK_DIR)/ttkCache.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkCache.c

ttkClamTheme.o: $(TTK_DIR)/ttkClamTheme.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkClamTheme.c

ttkClassicTheme.o: $(TTK_DIR)/ttkClassicTheme.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkClassicTheme.c

ttkDefaultTheme.o: $(TTK_DIR)/ttkDefaultTheme.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkDefaultTheme.c

ttkElements.o: $(TTK_DIR)/ttkElements.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkElements.c

ttkEntry.o: $(TTK_DIR)/ttkEntry.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkEntry.c

ttkFrame.o: $(TTK_DIR)/ttkFrame.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkFrame.c

ttkImage.o: $(TTK_DIR)/ttkImage.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkImage.c

ttkInit.o: $(TTK_DIR)/ttkInit.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkInit.c

ttkLabel.o: $(TTK_DIR)/ttkLabel.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkLabel.c

ttkLayout.o: $(TTK_DIR)/ttkLayout.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkLayout.c

ttkManager.o: $(TTK_DIR)/ttkManager.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkManager.c

ttkNotebook.o: $(TTK_DIR)/ttkNotebook.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkNotebook.c

ttkPanedwindow.o: $(TTK_DIR)/ttkPanedwindow.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkPanedwindow.c

ttkProgress.o: $(TTK_DIR)/ttkProgress.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkProgress.c

ttkScale.o: $(TTK_DIR)/ttkScale.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkScale.c

ttkScroll.o: $(TTK_DIR)/ttkScroll.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkScroll.c

ttkScrollbar.o: $(TTK_DIR)/ttkScrollbar.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkScrollbar.c

ttkSeparator.o: $(TTK_DIR)/ttkSeparator.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkSeparator.c

ttkSquare.o: $(TTK_DIR)/ttkSquare.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkSquare.c

ttkState.o: $(TTK_DIR)/ttkState.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkState.c

ttkStubInit.o: $(TTK_DIR)/ttkStubInit.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkStubInit.c

ttkStubLib.o: $(TTK_DIR)/ttkStubLib.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkStubLib.c

ttkTagSet.o: $(TTK_DIR)/ttkTagSet.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTagSet.c

ttkTheme.o: $(TTK_DIR)/ttkTheme.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTheme.c

ttkTrace.o: $(TTK_DIR)/ttkTrace.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTrace.c

ttkTrack.o: $(TTK_DIR)/ttkTrack.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTrack.c

ttkTreeview.o: $(TTK_DIR)/ttkTreeview.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTreeview.c

ttkWidget.o: $(TTK_DIR)/ttkWidget.c
	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkWidget.c

ttkMacOSXTheme.o: $(MAC_OSX_DIR)/ttkMacOSXTheme.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/ttkMacOSXTheme.c

.c.o:
	$(CC) -c $(CC_SWITCHES) $<

#
# Target to regenerate header files and stub files from the *.decls tables.
#

$(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \
		$(GENERIC_DIR)/tkInt.decls
	@@echo "Warning: tkStubInit.c may be out of date."
	@@echo "Developers may want to run \"make genstubs\" to regenerate."
	@@echo "This warning can be safely ignored, do not report as a bug!"

$(TTK_DIR)/ttkStubInit.c: $(TTK_DIR)/ttk.decls
	@@echo "Warning: ttkStubInit.c may be out of date."
	@@echo "Developers may want to run \"make genstubs\" to regenerate."
	@@echo "This warning can be safely ignored, do not report as a bug!"

genstubs:
	$(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
		$(GENERIC_DIR)/tk.decls $(GENERIC_DIR)/tkInt.decls
	$(TCL_EXE) $(TTK_DIR)/ttkGenStubs.tcl $(TTK_DIR) $(TTK_DIR)/ttk.decls

#
# Target to check that all exported functions have an entry in the stubs
# tables.
#

checkstubs: $(TK_LIB_FILE)
	-@@for i in `nm -p $(TK_LIB_FILE) \
		| awk '$$2 ~ /^[TDBCS]$$/ { sub("^_", "", $$3); print $$3 }' \
		| sort -n`; do \
		match=0; \
		for j in $(TK_DECLS) $(TTK_DECLS); do \
		    if [ `grep -c "$$i *(" $$j` -gt 0 ]; then \
			match=1; \
		    fi; \
		done; \
		if [ $$match -eq 0 ]; then echo $$i; fi \
	done

#
# Target to check for proper usage of UCHAR macro.
#

checkuchar:
	-egrep isalnum\|isalpha\|iscntrl\|isdigit\|islower\|isprint\|ispunct\|isspace\|isupper\|isxdigit\|toupper\|tolower $(SRCS) | grep -v UCHAR

#
# Target to make sure that only symbols with "Tk", "tk", "Ttk", "ttk" or "X"
# prefixes are exported.
#

checkexports: $(TK_LIB_FILE)
	-@@nm -p $(TK_LIB_FILE) \
	| awk '$$2 ~ /^[TDBCS]$$/ { sub("^_", "", $$3); print $$3 }' \
	| sort -n | grep -E -v '^([Tt]t?k|_?X)' || true

#
# Target to create a Tk RPM for Linux.  Requires that you be on a Linux
# system.
#

rpm: all
	rm -f THIS.TCL.SPEC
	echo "%define _builddir `pwd`" > THIS.TK.SPEC
	echo "%define _rpmdir `pwd`/RPMS" >> THIS.TK.SPEC
	cat tk.spec >> THIS.TK.SPEC
	mkdir -p RPMS/i386
	rpmbuild -bb THIS.TK.SPEC
	mv RPMS/i386/*.rpm .
	rm -rf RPMS THIS.TK.SPEC

#
# Target to create a proper Tk distribution from information in the
# master source directory.  DISTDIR must be defined to indicate where
# to put the distribution.  DISTDIR must be an absolute path name.
#

DISTROOT = /tmp/dist
DISTNAME = tk${VERSION}${PATCH_LEVEL}
ZIPNAME	 = tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
DISTDIR	 = $(DISTROOT)/$(DISTNAME)
TCLDIR   = @@TCL_SRC_DIR@@
$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
		$(UNIX_DIR)/aclocal.m4
	cd $(UNIX_DIR); autoconf
$(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
	cd $(MAC_OSX_DIR); autoconf
$(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
	cd $(MAC_OSX_DIR); autoheader; touch $@@

dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure genstubs
	rm -rf $(DISTDIR)
	mkdir -p $(DISTDIR)/unix
	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
	cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
	chmod 664 $(DISTDIR)/unix/Makefile.in
	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
		$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
		$(UNIX_DIR)/README $(UNIX_DIR)/installManPage \
		$(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(DISTDIR)/unix
	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
	chmod +x $(DISTDIR)/unix/install-sh
	mkdir $(DISTDIR)/bitmaps
	@@(cd $(TOP_DIR); for i in bitmaps/* ; do \
	    if [ -f $$i ] ; then \
		sed -e 's/static char/static unsigned char/' \
		       $$i > $(DISTDIR)/$$i; \
	    fi; \
	done;)
	mkdir $(DISTDIR)/generic
	cp -p $(GENERIC_DIR)/*.[ch] $(DISTDIR)/generic
	cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
	cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog \
		$(TOP_DIR)/ChangeLog.2??? $(TOP_DIR)/README \
		$(TOP_DIR)/license.terms $(DISTDIR)
	rm -f $(DISTDIR)/generic/blt*.[ch]
	mkdir $(DISTDIR)/generic/ttk
	cp -p $(TTK_DIR)/*.[ch] $(TTK_DIR)/ttk.decls \
		$(TTK_DIR)/ttkGenStubs.tcl $(DISTDIR)/generic/ttk
	mkdir $(DISTDIR)/win
	cp $(TOP_DIR)/win/Makefile.in $(DISTDIR)/win
	cp $(TOP_DIR)/win/configure.in \
		$(TOP_DIR)/win/configure \
		$(TOP_DIR)/win/tkConfig.sh.in \
		$(TOP_DIR)/win/aclocal.m4 $(TOP_DIR)/win/tcl.m4 \
		$(DISTDIR)/win
	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.bat $(DISTDIR)/win
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/*.bat
	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/makefile.*
	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rules.vc
	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
	mkdir $(DISTDIR)/win/rc
	cp -p $(TOP_DIR)/win/wish.exe.manifest.in $(DISTDIR)/win/
	cp -p $(TOP_DIR)/win/rc/*.{rc,cur,ico,bmp} $(DISTDIR)/win/rc
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/wish.exe.manifest.in
	mkdir $(DISTDIR)/macosx
	cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \
		$(TOP_DIR)/macosx/*.icns $(TOP_DIR)/macosx/*.tiff \
		$(TOP_DIR)/macosx/*.[ch] $(TOP_DIR)/macosx/*.in \
		$(TOP_DIR)/macosx/*.ac $(TOP_DIR)/macosx/*.xcconfig \
		$(TOP_DIR)/macosx/*.sdef  $(TOP_DIR)/macosx/configure \
		$(DISTDIR)/macosx
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
	mkdir $(DISTDIR)/macosx/Tk.xcode
	cp -p $(TOP_DIR)/macosx/Tk.xcode/project.pbxproj \
		$(TOP_DIR)/macosx/Tk.xcode/default.pbxuser \
		$(DISTDIR)/macosx/Tk.xcode
	mkdir $(DISTDIR)/macosx/Tk.xcodeproj
	cp -p $(TOP_DIR)/macosx/Tk.xcodeproj/project.pbxproj \
		$(TOP_DIR)/macosx/Tk.xcodeproj/default.pbxuser \
		$(DISTDIR)/macosx/Tk.xcodeproj
	mkdir $(DISTDIR)/carbon
	cp -p $(TOP_DIR)/carbon/GNUmakefile $(TOP_DIR)/carbon/README \
		$(TOP_DIR)/carbon/Wish.icns $(TOP_DIR)/carbon/*.[chr] \
		$(TOP_DIR)/carbon/*.in $(TOP_DIR)/carbon/*.ac \
		$(TOP_DIR)/carbon/*.xcconfig $(DISTDIR)/carbon
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/carbon
	mkdir $(DISTDIR)/carbon/Wish.xcode
	cp -p $(TOP_DIR)/carbon/Wish.xcode/project.pbxproj \
		$(TOP_DIR)/carbon/Wish.xcode/default.pbxuser \
		$(DISTDIR)/carbon/Wish.xcode
	mkdir $(DISTDIR)/carbon/Wish.xcodeproj
	cp -p $(TOP_DIR)/carbon/Wish.xcodeproj/project.pbxproj \
		$(TOP_DIR)/carbon/Wish.xcodeproj/default.pbxuser \
		$(DISTDIR)/carbon/Wish.xcodeproj
	mkdir $(DISTDIR)/compat
	cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \
		$(TCLDIR)/compat/stdlib.h $(TCLDIR)/compat/limits.h \
		$(DISTDIR)/compat
	mkdir $(DISTDIR)/xlib
	cp -p $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/xlib
	mkdir $(DISTDIR)/xlib/X11
	cp -p $(XLIB_DIR)/X11/*.h $(DISTDIR)/xlib/X11
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/xlib/X11
	mkdir $(DISTDIR)/library
	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
		$(TOP_DIR)/library/tclIndex \
		$(DISTDIR)/library
	mkdir $(DISTDIR)/library/ttk
	cp -p $(TOP_DIR)/library/ttk/*.tcl $(DISTDIR)/library/ttk
	mkdir $(DISTDIR)/library/images
	@@(cd $(TOP_DIR); for i in library/images/* ; do \
	    if [ -f $$i ] ; then \
		cp $$i $(DISTDIR)/$$i; \
	    fi; \
	done;)
	mkdir $(DISTDIR)/library/msgs
	@@(cd $(TOP_DIR); for i in library/msgs/*.msg ; do \
	    if [ -f $$i ] ; then \
		cp $$i $(DISTDIR)/$$i; \
	    fi; \
	done;)
	mkdir $(DISTDIR)/library/demos
	cp -pr $(TOP_DIR)/library/demos/*.tcl \
		$(TOP_DIR)/library/demos/*.msg \
		$(TOP_DIR)/library/demos/tclIndex \
		$(TOP_DIR)/library/demos/browse \
		$(TOP_DIR)/library/demos/hello $(TOP_DIR)/library/demos/ixset \
		$(TOP_DIR)/library/demos/rmt $(TOP_DIR)/library/demos/rolodex \
		$(TOP_DIR)/library/demos/square \
		$(TOP_DIR)/library/demos/tcolor \
		$(TOP_DIR)/library/demos/timer \
		$(TOP_DIR)/library/demos/widget \
		$(TOP_DIR)/library/demos/README \
		$(TOP_DIR)/license.terms $(DISTDIR)/library/demos
	mkdir $(DISTDIR)/library/demos/images
	@@(cd $(TOP_DIR); for i in library/demos/images/* ; do \
	    if [ -f $$i ] ; then \
		cp $$i $(DISTDIR)/$$i; \
	    fi; \
	done;)
	mkdir $(DISTDIR)/doc
	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
		$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
	mkdir $(DISTDIR)/tests
	cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
		$(TEST_DIR)/README $(TEST_DIR)/*.{gif,ppm,xbm} \
		$(TEST_DIR)/option.file* $(DISTDIR)/tests
	mkdir $(DISTDIR)/tests/ttk
	cp -p $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk

alldist: dist
	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar $(DISTNAME); \
		gzip -9 $(DISTNAME)-src.tar; zip -qr8 $(ZIPNAME) $(DISTNAME)

#
# This target creates the HTML folder for Tcl & Tk and places it
# in DISTDIR/html.  It uses the tcltk-man2html.tcl tool from
# the Tcl group's tool workspace.  It depends on the Tcl & Tk being
# in directories called tcl8.3 & tk8.3 up two directories from the
# TOOL_DIR.
#

html:
	$(BUILD_HTML)
	@@EXTRA_BUILD_HTML@@
html-tcl:
	$(BUILD_HTML) --tcl
	@@EXTRA_BUILD_HTML@@
html-tk:
	$(BUILD_HTML) --tk
	@@EXTRA_BUILD_HTML@@

BUILD_HTML = \
	@@if test -f "$(BUILD_TCLSH)"; then \
	$(SHELL_ENV) TCLSH="$(BUILD_TCLSH)"; else \
	TCLSH="$(TCL_EXE)"; fi ;\
	"$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \
		--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)

#
# The list of all the targets that do not correspond to real files. This stops
# 'make' from getting confused when someone makes an error in a rule.
#

.PHONY: all binaries libraries objs doc html html-tcl html-tk test runtest
.PHONY: install install-strip install-binaries install-libraries
.PHONY: install-headers install-private-headers install-doc
.PHONY: clean distclean depend genstubs checkstubs checkexports checkuchar
.PHONY: shell gdb valgrind valgrindshell dist alldist rpm
.PHONY: tkLibObjs tktest-real test-classic test-ttk testlang
.PHONY: demo install-demos

# DO NOT DELETE THIS LINE -- make depend depends on it.
@


1.173
log
@[Bug 2446711]: Remove 'allpatch' target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.172 2010/12/17 17:57:45 stwo Exp $
d1698 7
a1704 5
.PHONY: all binaries libraries doc tkLibObjs objs tktest-real test test-classic
.PHONY: test-ttk testlang runtest shell demo gdb install install-strip
.PHONY: install-binaries install-libraries install-demos install-doc
.PHONY: install-private-headers clean distclean depend genstubs checkstubs
.PHONY: checkuchar checkexports rpm dist alldist html html-tcl html-tk
@


1.172
log
@Use 'rpmbuild', not 'rpm' [Bug 2537626].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.171 2010/12/16 01:55:02 stwo Exp $
a1662 5
#
# The following target can only be used for non-patch releases.  Use
# the "allpatch" target below for patch releases.
#

a1668 17
# The target below is similar to "alldist" except it works for patch
# releases.  It is needed because patch releases are peculiar: the
# patch designation appears in the name of the compressed file
# (e.g. tk8.0p1.tar.gz) but the extracted source directory doesn't
# include the patch designation (e.g. tk8.0).
#

allpatch: dist
	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
	mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/old
	mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tk${VERSION}
	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar tk${VERSION}; \
		gzip -9 $(DISTNAME)-src.tar; zip -r8 $(ZIPNAME) tk${VERSION}
	mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/$(DISTNAME)
	mv $(DISTROOT)/old $(DISTROOT)/tk${VERSION}

#
d1702 1
a1702 1
.PHONY: checkuchar checkexports rpm dist alldist allpatch html html-tcl html-tk
@


1.171
log
@Installer Improvements. Similar to Tcl [Patch 3101127].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.170 2010/08/27 01:00:23 hobbs Exp $
d1496 1
a1496 1
rpm: all /bin/rpm
d1502 1
a1502 1
	rpm -bb THIS.TK.SPEC
@


1.170
log
@	* unix/Makefile.in: add valgrind target
	* unix/configure, unix/tcl.m4: SHLIB_LD_LIBS='${LIBS}' for OSF1-V*.
	Add /usr/lib64 to set of auto-search dirs. [Bug 1230554]
	(SC_PATH_X): Correct syntax error when xincludes not found.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.169 2010/08/12 00:34:56 hobbs Exp $
d223 1
a223 1
INSTALL			= @@srcdir@@/install-sh -c
d227 1
a578 1
	chmod +x $(UNIX_DIR)/install-sh
d694 7
a700 1
INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @@EXTRA_INSTALL@@
d719 1
a719 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
a722 3
	@@if test ! -x $(SRC_DIR)/install-sh; then \
	    chmod +x $(SRC_DIR)/install-sh; \
	    fi
d746 1
a746 1
	@@mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
d750 1
a750 4
	@@if test "$(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS)" != ""; then \
	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
		"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
d755 1
a755 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d759 1
a759 13
	@@if test ! -x $(SRC_DIR)/install-sh; then \
	    chmod +x $(SRC_DIR)/install-sh; \
	    fi
	@@echo "Installing header files";
	@@for i in $(PUBLIC_HDRS); \
	    do \
	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
	    done;
	@@list='$(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS)'; for i in $$list ; \
	    do \
	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
	    done;
	@@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
d765 1
a765 1
	@@echo "Installing library ttk directory";
d772 1
a772 1
	@@echo "Installing library images directory";
d779 1
a779 1
	@@echo "Installing translation directory";
d792 1
a792 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d796 1
a796 1
	@@echo "Installing demos to $(DEMO_INSTALL_DIR)/";
d808 1
a808 1
	@@echo "Installing demo images";
d821 1
a821 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d825 1
a825 1
	@@echo "Installing and cross-linking top-level (.1) docs";
d829 1
a829 2

	@@echo "Installing and cross-linking C API (.3) docs";
d833 1
a833 2

	@@echo "Installing and cross-linking command (.n) docs";
d838 21
d860 1
a860 1
install-private-headers: libraries
d865 1
a865 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d869 1
a869 4
	@@if test ! -x $(SRC_DIR)/install-sh; then \
	    chmod +x $(SRC_DIR)/install-sh; \
	    fi
	@@echo "Installing private header files";
@


1.169
log
@        * unix/configure: regen with ac-2.59
        * unix/configure.in, unix/Makefile.in:
        * unix/tcl.m4 (AIX): remove the need for ldAIX, replace with
        -bexpall/-brtl.  Remove TK_EXP_FILE (export file) and other
        baggage that went with it.  Remove pre-4 AIX build support.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.168 2010/03/23 10:45:13 dkf Exp $
d686 8
@


1.168
log
@	* unix/configure.in, unix/Makefile.in: [Bug 2965133]: Get rid of the
	spurious NONE and some pointless quotes that were causing problems
	with building Tk on OSX. Overall bug might not yet be solved.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.167 2010/02/22 23:38:53 nijtmans Exp $
a258 2
TK_EXP_FILE		= @@TK_EXP_FILE@@
TK_BUILD_EXP_FILE	= @@TK_BUILD_EXP_FILE@@
d573 1
a573 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} ${WISH_EXE}
d699 1
a699 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) ${WISH_EXE}
a725 5
	@@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
			"$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
	    fi
@


1.167
log
@Use @@EXEEXT@@ in stead of @@EXT_SUFFIX@@
Use -DBUILD_tk in Makefile
Make internal Tk_ObjCustomOption const
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.166 2010/02/19 15:02:54 dkf Exp $
d682 1
a682 1
	@@echo "set env @@LD_LIBRARY_PATH_VAR@@=\"`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}\"" > gdb.run
@


1.166
log
@Fix [Bug 2415437] with supplied patch. LIB_RUNTIME_DIR now not forced to be
the same as $libdir.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.165 2009/12/23 07:16:52 nijtmans Exp $
d211 1
a211 1
EXE_SUFFIX		= @@EXE_SUFFIX@@
d232 1
a232 1
SHLIB_CFLAGS		= @@SHLIB_CFLAGS@@
@


1.165
log
@Use EXE_SUFFIX for Cygwin, and
install libtk8.6.dll in bin directory
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.164 2009/11/23 16:09:33 dkf Exp $
d55 1
a55 1
LIB_RUNTIME_DIR		= $(libdir)
@


1.164
log
@Better fix for the problem when someone tricks make into thinking 'test' is a
real target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.163 2009/11/23 15:59:18 dkf Exp $
d211 1
d213 1
d575 1
a575 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
d616 1
a616 1
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @@APP_RSRC_FILE@@
d618 1
a618 1
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
d626 1
a626 1
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
d631 1
a631 1
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
d651 2
a652 2
test-classic: tktest
	$(SHELL_ENV) ./tktest $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
d654 2
a655 2
test-ttk: tktest
	$(SHELL_ENV) ./tktest $(TEST_DIR)/ttk/all.tcl -geometry +0+0 \
d659 1
a659 1
testlang: tktest
d664 1
a664 1
	./tktest $(TEST_DIR)/all.tcl -geometry +0+0 \
d669 2
a670 2
runtest: tktest
	$(SHELL_ENV) ./tktest
d674 2
a675 2
shell: wish
	$(SHELL_ENV) ./wish $(SCRIPT)
d678 1
a678 1
	$(SHELL_ENV) ./wish $(TOP_DIR)/library/demos/widget
d681 1
a681 1
gdb: wish
d685 1
a685 1
	gdb ./wish --command=gdb.run
d701 1
a701 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
d719 1
a719 2
	    echo "if {[catch {package present Tcl\
		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
d725 1
a725 1
	@@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
d727 1
a727 1
	@@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
d733 2
a734 2
	@@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
	@@$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
d885 1
a885 1
		errors wish tktest lib.exp Tk *.rsrc
d902 1
a902 1
tkTestInit.o: $(UNIX_DIR)/tkAppInit.c wish
@


1.163
log
@Commented out broken rule that stopped 'make test' from working.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.162 2009/11/19 23:45:08 nijtmans Exp $
d1714 11
@


1.162
log
@Compile tkTest.c and friends with Stubs
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.161 2009/11/19 22:21:01 nijtmans Exp $
d631 8
a638 8
# FIXME: This xttest rule seems to be broken in a number of ways.
# It should use CC_SEARCH_FLAGS, it does not include the shared
# lib location logic from tktest, and it is not clear where this
# test.o object file comes from.
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) ${TK_STUB_LIB_FILE}
	${CC} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
		@@TK_BUILD_LIB_SPEC@@ ${TK_STUB_LIB_FILE}  ${TCL_STUB_LIB_SPEC} \
		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
@


1.161
log
@[Patch #2883533] tcl.m4 support for Haiku OS
unix/Makefile.in:     Fix library order in X11_LIB_SWITCHES
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.160 2009/11/10 23:36:19 andreas_kupries Exp $
d627 2
a628 2
tktest-real:
	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @@TK_BUILD_LIB_SPEC@@ \
d635 1
a635 1
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
d637 1
a637 1
		@@TK_BUILD_LIB_SPEC@@ \
@


1.160
log
@
	* unix/Makefile.in: Partially reverted Don Porter's 2009-10-20
	* win/Makefile.in: commit. The OSX Cocoa code branch still needs
	tclInt.h and the internal headers, thus the TCL_PLATFORM
	directory. See tclMacOSXNotify.c for example.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.159 2009/10/26 16:56:46 dgp Exp $
d159 1
a159 1
X11_LIB_SWITCHES	= @@XLIBSW@@ $(XFT_LIBS)
d335 1
a335 1
CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} 
@


1.159
log
@        * unix/Makefile.in:     Remove $(PACKAGE).* and prototype from the
        `make distclean` target.  Completes 2009-10-20 commit.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.158 2009/10/20 17:23:09 dgp Exp $
d106 4
d331 1
a331 1
${@@TK_WINDOWINGSYSTEM@@_INCLUDES} ${AC_FLAGS} \
d340 1
a340 1
-I${TCL_GENERIC_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} \
@


1.158
log
@Also removed the long outdated and broken
        targets package-* that were for building Solaris packages.  Appears
        that the pieces needed for these targets to function have never been
        present in the current era of Tcl development and belong completely
        to Tcl pre-history.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.157 2009/10/20 16:57:25 dgp Exp $
d884 1
a884 1
		$(PACKAGE).* prototype tkConfig.h *.plist Tk.framework tk.pc
@


1.157
log
@        * unix/Makefile.in:     Compiling Tk no longer requires header files
        * win/Makefile.in:      from the TCL_PLATFORM DIR.  Baby step in
        pursuit of [Bug 1712098].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.156 2009/08/24 00:57:20 das Exp $
a1709 82
#
# Targets to build Solaris package of the distribution for the current
# architecture.  To build stream packages for both sun4 and i86pc
# architectures: 
#
#   On the sun4 machine, execute the following:
#     make distclean; ./configure
#     make DISTDIR=<distdir> package
#
#   Once the build is complete, execute the following on the i86pc
#   machine:
#     make DISTDIR=<distdir> package-quick
#
# <distdir> is the absolute path to a directory where the build should
# take place.  These steps will generate the $(PACKAGE).sun4 and
# $(PACKAGE).i86pc stream packages.  It is important that the packages be
# built in this fashion in order to ensure that the architecture
# independent files are exactly the same, including timestamps, in
# both packages.
#

PACKAGE=SCRPtk

package: dist package-config package-common package-binaries package-generate
package-quick: package-config package-binaries package-generate

#
# Configure for the current architecture in the dist directory.
#
package-config:
	mkdir -p $(DISTDIR)/unix/`arch`
	cd $(DISTDIR)/unix/`arch`; \
        ../configure --prefix=/opt/SUNWtcl/$(TCLVERSION) \
		--exec_prefix=/opt/SUNWtcl/$(TCLVERSION)/`arch` \
		--with-tcl=$(DISTDIR)/../tcl$(TCLVERSION)/unix/`arch` \
		--enable-shared
	mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)
	mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`

#
# Build and install the architecture independent files in the dist directory.
#

package-common:
	cd $(DISTDIR)/unix/`arch`;\
	$(MAKE); \
	$(MAKE) install-libraries install-doc \
		prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \
		exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`
	mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin
	sed -e "s/TCLVERSION/$(TCLVERSION)/g" \
		-e "s/TKVERSION/$(VERSION)/g" < $(UNIX_DIR)/wish.sh \
		> $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)
	chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION)

#
# Build and install the architecture specific files in the dist directory.
#

package-binaries: 
	cd $(DISTDIR)/unix/`arch`; \
	$(MAKE); \
	$(MAKE) install-binaries prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \
		exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`

#
# Generate a package from the installed files in the dist directory for the
# current architecture.
#

package-generate:
	pkgproto $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin=bin \
		 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/include=include \
		 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/lib=lib \
		 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/man=man \
		 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`=`arch` \
	| $(TCL_EXE) $(TCLDIR)/unix/mkProto.tcl $(TCLVERSION) \
		$(UNIX_DIR) > prototype
	pkgmk -o -d . -f prototype -a `arch`
	pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
	rm -rf $(PACKAGE)

@


1.156
log
@	* macosx/Wish.sdef (new file):		Install and enable sdef file
	* macosx/Wish-Info.plist.in:		into Wish application bundle,
	* macosx/Tk.xcode/project.pbxproj:	describing TkAqua apple event
	* macosx/Tk.xcodeproj/project.pbxproj:	support for use by AppleScript.
	* unix/Makefile.in:			(replaces functionality of
	* unix/configure.in:			'aete' resource removed with
						Cocoa port & fixes AppleScript
						issues reported on tcl-mac)
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.155 2009/07/18 08:16:09 das Exp $
a105 4
# The directory containing the platform specific Tcl sources and headers
# appropriate for this version of Tk:
TCL_PLATFORM_DIR	= @@TCL_SRC_DIR@@/unix

d327 1
a327 1
-I${TCL_PLATFORM_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} ${AC_FLAGS} \
d336 1
a336 1
-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} \
@


1.155
log
@	* unix/Makefile.in:		Define NDEBUG in optimized (non-
					symbols) build to disable assert()s.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.154 2009/06/29 14:35:01 das Exp $
d1580 2
a1581 1
		$(TOP_DIR)/macosx/configure $(DISTDIR)/macosx
@


1.154
log
@Merge of TkAqua Cocoa port
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.153 2009/06/26 01:42:05 das Exp $
d134 1
a134 1
CFLAGS_OPTIMIZE		= @@CFLAGS_OPTIMIZE@@
@


1.153
log
@	* unix/Makefile.in:		add support for --enable-aqua=carbon
	* unix/configure.in:		configure option (legacy fallback for
					pre-Mac OS X 10.5 releases).

	* unix/configure:		autoconf-2.59
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.152 2009/04/24 15:34:41 stwo Exp $
d401 1
a401 1
	tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXCarbonEvents.o \
d529 1
a529 1
	$(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c \
a1220 3
tkMacOSXCarbonEvents.o: $(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c

d1309 3
d1577 4
a1580 4
		$(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.[chr] \
		$(TOP_DIR)/macosx/*.in $(TOP_DIR)/macosx/*.ac \
		$(TOP_DIR)/macosx/*.xcconfig $(TOP_DIR)/macosx/configure \
		$(DISTDIR)/macosx
d1582 8
a1589 7
	mkdir $(DISTDIR)/macosx/Wish.pbproj
	cp -p $(TOP_DIR)/macosx/Wish.pbproj/*.pbx* $(DISTDIR)/macosx/Wish.pbproj
	mkdir $(DISTDIR)/macosx/Wish.xcode
	cp -p $(TOP_DIR)/macosx/Wish.xcode/*.pbx* $(DISTDIR)/macosx/Wish.xcode
	mkdir $(DISTDIR)/macosx/Wish.xcodeproj
	cp -p $(TOP_DIR)/macosx/Wish.xcodeproj/*.pbx* \
		$(DISTDIR)/macosx/Wish.xcodeproj
d1597 3
a1599 1
	cp -p $(TOP_DIR)/carbon/Wish.xcode/*.pbx* $(DISTDIR)/carbon/Wish.xcode
d1601 2
a1602 1
	cp -p $(TOP_DIR)/carbon/Wish.xcodeproj/*.pbx* \
@


1.152
log
@Removed stray @@ from Makefile.in test target. [Bug 2764263]
Don't chmod+x square demo. [Bug 1945073]
Adjustable demo install location. [Patch 2764272]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.151 2009/04/24 15:07:48 stwo Exp $
d314 1
a314 1
MAC_OSX_DIR		= $(TOP_DIR)/macosx
d1576 4
a1579 4
	cp -p $(MAC_OSX_DIR)/GNUmakefile $(MAC_OSX_DIR)/README \
		$(MAC_OSX_DIR)/Wish.icns $(MAC_OSX_DIR)/*.[chr] \
		$(MAC_OSX_DIR)/*.in $(MAC_OSX_DIR)/*.ac \
		$(MAC_OSX_DIR)/*.xcconfig $(MAC_OSX_DIR)/configure \
d1583 1
a1583 1
	cp -p $(MAC_OSX_DIR)/Wish.pbproj/*.pbx* $(DISTDIR)/macosx/Wish.pbproj
d1585 1
a1585 1
	cp -p $(MAC_OSX_DIR)/Wish.xcode/*.pbx* $(DISTDIR)/macosx/Wish.xcode
d1587 1
a1587 1
	cp -p $(MAC_OSX_DIR)/Wish.xcodeproj/*.pbx* \
d1589 11
@


1.151
log
@Don't chmod/exec installManPage. [Patch 2769530]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.150 2009/03/14 17:35:04 dkf Exp $
d98 3
d563 1
a563 1
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
a647 1
	@@
d800 1
a800 3
	@@for i in "$(SCRIPT_INSTALL_DIR)" \
		"$(SCRIPT_INSTALL_DIR)"/demos \
		"$(SCRIPT_INSTALL_DIR)"/demos/images ; \
d809 1
a809 1
	@@echo "Installing demos to $(SCRIPT_INSTALL_DIR)/demos/";
d814 1
a814 1
			$$i > "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \
d819 1
a819 1
	    chmod 755 "$(SCRIPT_INSTALL_DIR)"/demos/$$i; \
d825 1
a825 1
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/demos/images; \
@


1.150
log
@Added support for reporting TEA-like info via pkg-config. [Patch 2243962]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.149 2009/01/20 03:39:06 kennykb Exp $
d193 1
a193 1
SHELL			= /bin/sh
a829 3
	@@if test ! -x $(UNIX_DIR)/installManPage; then \
	    chmod +x $(UNIX_DIR)/installManPage; \
	    fi
d841 1
a841 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
d846 1
a846 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
d851 1
a851 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
@


1.149
log
@Patch 907924
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.148 2008/12/28 13:08:38 dkf Exp $
d739 3
d891 1
a891 1
		$(PACKAGE).* prototype tkConfig.h *.plist Tk.framework
d1527 1
a1527 1
dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure genstubs
d1537 1
a1537 1
		$(UNIX_DIR)/tkConfig.h.in $(DISTDIR)/unix
@


1.148
log
@Implementation of TIP #244, PNG image support.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.147 2008/12/05 10:48:52 dkf Exp $
d95 3
d570 1
a570 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
d698 2
a699 1
	@@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
d732 2
a733 2
	@@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
	@@$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
@


1.147
log
@Remove references to deleted file
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.146 2008/10/18 14:22:22 dkf Exp $
d351 2
a352 2
IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPPM.o tkImgPhoto.o \
	tkImgPhInstance.o
d444 1
a444 1
	$(GENERIC_DIR)/tkImgPPM.c \
d1089 3
@


1.146
log
@Implementation of the [tk busy] command on non-OSX.
Adapted from [Patch 1997907]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.145 2008/08/25 11:44:03 dkf Exp $
d763 2
a764 2
	@@for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
	        $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
d1538 1
a1538 1
	cp -p $(GENERIC_DIR)/*.[ch] $(GENERIC_DIR)/prolog.ps $(DISTDIR)/generic
@


1.145
log
@Split the photo image core into two pieces to make it easier to maintain.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.144 2008/04/02 03:55:39 dgp Exp $
d361 2
a362 1
GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkClipboard.o \
d416 2
a417 1
	$(GENERIC_DIR)/tkBitmap.c $(GENERIC_DIR)/tkClipboard.c \
d927 3
@


1.144
log
@        * generic/tkWindow.c:   Revised package initialization so that
        * unix/Makefile.in:     "tkStubsPtr" is not present in libtk.so, but
        is present only in libtkstub.a.  This tightens up the rules for users
        of the stubs interfaces.  [Tcl Bug 1819422].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143 2008/03/21 21:49:12 jenglish Exp $
d351 2
a352 1
IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPPM.o tkImgPhoto.o
d443 2
a444 1
	$(GENERIC_DIR)/tkImgPhoto.c $(GENERIC_DIR)/tkText.c \
d1087 1
a1087 1
tkImgPhoto.o: $(GENERIC_DIR)/tkImgPhoto.c
d1090 3
@


1.143
log
@Keep ttkStubLib.o in libtkstub instead of libtk. [Bug 1920030]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.141 2008/03/18 06:59:04 jenglish Exp $
d375 1
a375 1
STUB_OBJS = tkStubInit.o tkStubLib.o
d449 1
a449 1
	$(GENERIC_DIR)/tkStubInit.c $(GENERIC_DIR)/tkStubLib.c
@


1.143.2.1
log
@        * unix/Makefile.in:     Relax constraints in index script so that
        * win/Makefile.in:      each Tk 8.5.* release may be [package require]d
        * win/makefile.vc:      into any Tcl 8.5.* interp.  [Bug 1890438].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143 2008/03/21 21:49:12 jenglish Exp $
d707 2
a708 1
	    echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\
@


1.143.2.2
log
@Backport of Patch 907924
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.1 2008/10/10 18:55:31 dgp Exp $
a94 3
# Directory in which to install the configuration file tkConfig.sh:
CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)

d563 1
a563 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish
d691 1
a691 2
	@@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
d723 2
a724 2
	@@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
	@@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tkConfig.sh
@


1.143.2.3
log
@Squelch all mention of prolog.ps; it isn't used. [Bug 1466509]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.2 2009/01/20 03:54:53 kennykb Exp $
d762 1
a762 1
	@@for i in $(TOP_DIR)/library/*.tcl \
d1531 1
a1531 1
	cp -p $(GENERIC_DIR)/*.[ch] $(DISTDIR)/generic
@


1.143.2.4
log
@Don't chmod/exec installManPage. [Patch 2769530]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.3 2009/04/10 11:07:32 dkf Exp $
d193 1
a193 1
SHELL			= @@SHELL@@
d822 3
d836 1
a836 1
	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
d841 1
a841 1
	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
d846 1
a846 1
	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
@


1.143.2.5
log
@Removed stray @@ from Makefile.in test target. [Bug 2764263]
Don't chmod+x square demo. [Bug 1945073]
Adjustable demo install location. [Patch 2764272]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.4 2009/04/24 15:19:45 stwo Exp $
a97 3
# Directory in which to install the demo files:
DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos

d556 1
a556 1
DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget
d641 1
d790 3
a792 1
	@@for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)"/images ; \
d801 1
a801 1
	@@echo "Installing demos to $(DEMO_INSTALL_DIR)/";
d806 1
a806 1
			$$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
d811 1
a811 1
	    chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \
d817 1
a817 1
		$(INSTALL_DATA) $$i "$(DEMO_INSTALL_DIR)"/images; \
@


1.143.2.6
log
@        * generic/tkConsole.c:  Relax the runtime version requirements on Tcl
        * generic/tkMain.c:     so that Tk 8.5.8 can [load] into Tcl 8.6 (and
        * generic/tkWindow.c:   later 8.*) interps.
        * library/tk.tcl
        * unix/Makefile.in:
        * win/Makefile.in:
        * win/makefile.vc:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.5 2009/04/24 15:40:06 stwo Exp $
d713 1
a713 1
	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
@


1.143.2.7
log
@Trivial CYGWIN fixes (backported from trunk)
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.6 2009/10/15 17:48:50 dgp Exp $
d204 1
a204 1
BUILD_TCLSH		= @@BUILD_TCLSH@@@@EXEEXT@@
d569 1
a569 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${TK_BUILD_EXP_FILE} wish@@EXEEXT@@
d610 1
a610 1
wish@@EXEEXT@@: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @@APP_RSRC_FILE@@
d612 1
a612 1
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish@@EXEEXT@@
d620 1
a620 1
tktest@@EXEEXT@@: $(TKTEST_OBJS) $(TK_LIB_FILE)
d625 1
a625 1
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest@@EXEEXT@@
d645 2
a646 2
test-classic: tktest@@EXEEXT@@
	$(SHELL_ENV) ./tktest@@EXEEXT@@ $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
d648 2
a649 2
test-ttk: tktest@@EXEEXT@@
	$(SHELL_ENV) ./tktest@@EXEEXT@@ $(TEST_DIR)/ttk/all.tcl -geometry +0+0 \
d653 1
a653 1
testlang: tktest@@EXEEXT@@
d658 1
a658 1
	./tktest@@EXEEXT@@ $(TEST_DIR)/all.tcl -geometry +0+0 \
d663 2
a664 2
runtest: tktest@@EXEEXT@@
	$(SHELL_ENV) ./tktest@@EXEEXT@@
d668 2
a669 2
shell: wish@@EXEEXT@@
	$(SHELL_ENV) ./wish@@EXEEXT@@ $(SCRIPT)
d672 1
a672 1
	$(SHELL_ENV) ./wish@@EXEEXT@@ $(TOP_DIR)/library/demos/widget
d675 1
a675 1
gdb: wish@@EXEEXT@@
d679 1
a679 1
	gdb ./wish@@EXEEXT@@ --command=gdb.run
d695 1
a695 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish@@EXEEXT@@
d727 2
a728 2
	@@echo "Installing wish@@EXEEXT@@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@@EXEEXT@@"
	@@$(INSTALL_PROGRAM) wish@@EXEEXT@@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@@EXEEXT@@
d876 1
a876 1
		errors wish@@EXEEXT@@ tktest@@EXEEXT@@ lib.exp Tk *.rsrc
d893 1
a893 1
tkTestInit.o: $(UNIX_DIR)/tkAppInit.c wish@@EXEEXT@@
@


1.143.2.8
log
@        * unix/configure: regen with ac-2.59
        * unix/configure.in, unix/Makefile.in:
        * unix/tcl.m4 (AIX): remove the need for ldAIX, replace with
        -bexpall/-brtl.  Remove TK_EXP_FILE (export file) and other
        baggage that went with it.  Remove pre-4 AIX build support.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.7 2010/01/06 23:16:20 nijtmans Exp $
d257 2
d569 1
a569 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish@@EXEEXT@@
d695 1
a695 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish@@EXEEXT@@
d722 5
@


1.143.2.9
log
@	* unix/Makefile.in: add valgrind target
	* unix/configure, unix/tcl.m4: SHLIB_LD_LIBS='${LIBS}' for OSF1-V*.
	Add /usr/lib64 to set of auto-search dirs. [Bug 1230554]
	(SC_PATH_X): Correct syntax error when xincludes not found.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.8 2010/08/12 00:14:33 hobbs Exp $
a679 8
VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v

valgrind: tktest@@EXEEXT@@
	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest@@EXEEXT@@ $(TEST_DIR)/all.tcl -geometry +0+0 -singleproc 1 $(TESTFLAGS)

valgrindshell: tktest@@EXEEXT@@
	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest@@EXEEXT@@ $(SCRIPT)

@


1.143.2.10
log
@Use 'rpmbuild', not 'rpm' [Bug 2537626].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.9 2010/08/27 00:19:28 hobbs Exp $
d1479 1
a1479 1
rpm: all
d1485 1
a1485 1
	rpmbuild -bb THIS.TK.SPEC
@


1.143.2.11
log
@[Bug 2446711]: Remove 'allpatch' target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.143.2.10 2010/12/17 17:57:21 stwo Exp $
d1630 5
d1641 17
@


1.142
log
@ttkStubLib.o needs to be in tk library as well as stub library
@
text
@d373 1
a373 1
	ttkWidget.o ttkStubInit.o ttkStubLib.o
@


1.141
log
@Put ttkStubLib.o in libtkstub instead of libtk.  [Bug 1863007].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.140 2008/03/12 16:17:17 das Exp $
d373 1
a373 1
	ttkWidget.o ttkStubInit.o
@


1.140
log
@handle quoting of possibly empty XLIB_INCLUDE_INSTALL_DIR. [Bug 1912679]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.139 2008/03/11 22:33:22 das Exp $
d373 1
a373 3
	ttkWidget.o

TTK_STUB_OBJS =  ttkStubInit.o ttkStubLib.o
d377 1
a377 1
STUB_LIB_OBJS = tkStubLib.o
d401 1
a401 1
	$(STUB_OBJS) $(TTK_OBJS) $(TTK_STUB_OBJS) \
@


1.139
log
@	* macosx/GNUmakefile:			fix quoting to allow paths to
	* macosx/Wish-Common.xcconfig:		${builddir}, ${INSTALL_ROOT}
	* unix/Makefile.in:			and ${TCL_BIN_DIR} to contain
	* unix/configure.in:			spaces.
	* unix/install-sh:
	* unix/tcl.m4:

	* unix/Makefile.in (install-strip):	strip non-global symbols from
						dynamic library.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.138 2007/12/13 15:28:49 dgp Exp $
d741 1
a741 1
	    if [ ! -d "$$i" ] ; then \
@


1.138
log
@merge stable branch onto HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.9 2007/09/11 18:32:36 dgp Exp $
d213 1
a213 1
INSTALL_STRIP_LIBRARY   = -S -S
d558 1
a558 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
d617 1
a617 1
	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
d673 1
a673 1
	@@echo "set env @@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}" > gdb.run
d693 1
a693 1
	@@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
d695 1
a695 1
	    if [ ! -d $$i ] ; then \
d697 2
a698 2
		mkdir -p $$i; \
		chmod 755 $$i; \
d707 1
a707 1
	    rm -f $(PKG_INDEX); \
d714 1
a714 1
	    ) > $(PKG_INDEX); \
d718 1
a718 1
	@@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
d722 1
a722 1
			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
d725 1
a725 1
	@@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
d727 1
a727 1
	@@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
d736 4
a739 4
	    XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \
	for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \
		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
		$(SCRIPT_INSTALL_DIR)/msgs $(SCRIPT_INSTALL_DIR)/ttk; \
d741 1
a741 1
	    if [ ! -d $$i ] ; then \
d743 2
a744 2
		mkdir -p $$i; \
		chmod 755 $$i; \
d754 1
a754 1
	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
d758 1
a758 1
	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
d764 1
a764 1
	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
d770 1
a770 1
		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/ttk; \
d777 1
a777 1
		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/images; \
d784 1
a784 1
		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/msgs; \
d789 3
a791 3
	@@for i in $(SCRIPT_INSTALL_DIR) \
		$(SCRIPT_INSTALL_DIR)/demos \
		$(SCRIPT_INSTALL_DIR)/demos/images ; \
d793 1
a793 1
	    if [ ! -d $$i ] ; then \
d795 2
a796 2
		mkdir -p $$i; \
		chmod 755 $$i; \
d805 1
a805 1
			$$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
d810 1
a810 1
	    chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
d816 1
a816 1
		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
d824 1
a824 1
	@@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
d826 1
a826 1
	    if [ ! -d $$i ] ; then \
d828 2
a829 2
		mkdir -p $$i; \
		chmod 755 $$i; \
d835 1
a835 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
d840 1
a840 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
d845 1
a845 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
d850 1
a850 1
	@@for i in $(PRIVATE_INCLUDE_INSTALL_DIR); \
d852 1
a852 1
	    if [ ! -d $$i ] ; then \
d854 2
a855 2
		mkdir -p $$i; \
		chmod 755 $$i; \
d865 1
a865 1
	    $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
d868 1
a868 1
	    $(INSTALL_DATA) tkConfig.h $(PRIVATE_INCLUDE_INSTALL_DIR); \
d1680 1
a1680 1
	$${TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
@


1.137
log
@        * generic/tkConsole.c:  Revised calls to Tcl_InitStubs() and
        * generic/tkMain.c:     [package require Tcl] so that Tk Says What
        * generic/tkWindow.c:   It Means using the new facilties of [package]
        * library/tk.tcl:       in Tcl 8.5 about what version(s) of Tcl it
        * unix/Makefile.in:     is willing to work with.  [Bug 1578344].
        * win/Makefile.in:
        * win/makefile.vc:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.136 2007/09/06 19:34:02 dgp Exp $
@


1.136
log
@        * generic/tkWindow.c (Initialize):      Moved common Tk initialization
        * generic/tkInitScript.h (removed):     script out of tkInitScript.h
        * macosx/tkMacOSXInit.c:        and multiple TkpInit() routines and
        * unix/Makefile.in:     into the common Initialize() routine in
        * unix/tkUnixInit.c:    generic code.  Also removed constraint on
        * win/tkWinInit.c:      ability to define a custom [tkInit] before
        calling Tk_Init().  Until now the custom [tkInit] had to be a proc.
        Now it can be any command.  Removal of tkInitScript.h also fixes
        [Bug 1656283].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.135 2007/09/05 01:39:45 das Exp $
d709 2
a710 3
	    echo "if {![package vsatisfies [package provide Tcl] $(TCLVERSION)]} { return }";\
	    echo "if {[package vcompare [package provide Tcl]\
		$(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\
d712 1
a712 1
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(TCLPATCHL)\
@


1.135
log
@correct autoconf/autoheader dependencies
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.134 2007/09/04 19:19:01 dgp Exp $
d1170 1
a1170 1
tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh
d1246 1
a1246 1
tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh
@


1.134
log
@        * unix/Makefile.in:     It's unreliable to count on the release
        manager to remember to `make genstubs` before `make dist`.  Let the
        Makefile remember the dependency for us.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.133 2007/09/04 18:46:29 dgp Exp $
d1505 3
a1507 2
$(UNIX_DIR)/tkConfig.h.in: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
		$(UNIX_DIR)/aclocal.m4 $(MAC_OSX_DIR)/configure
a1508 2
$(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac
	cd $(MAC_OSX_DIR); autoconf
@


1.133
log
@        * unix/Makefile.in:     Corrections to `make dist` dependencies to be
        sure that macosx/configure gets generated whenever it does not exist.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.132 2007/08/07 05:07:21 das Exp $
d1511 1
a1511 1
dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure
@


1.132
log
@	* unix/Makefile.in:	add support for compile flags specific to
				object files linked directly into executables.

	* unix/configure.in (Darwin): only use -seg1addr flag when prebinding;
	use -mdynamic-no-pic flag for object files linked directly into exes.

	* unix/configure: autoconf-2.59
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.131 2007/07/09 19:35:34 hobbs Exp $
d1506 4
a1509 2
		$(UNIX_DIR)/aclocal.m4 $(MAC_OSX_DIR)/configure.ac
	cd $(MAC_OSX_DIR); autoconf; autoheader; touch $@@
d1511 1
a1511 1
dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in
@


1.131
log
@	* unix/Makefile.in: clarify what the headers installed are, and
	add ttkTheme.h and ttkDecls.h to private headers (later public).
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.130 2007/06/03 13:43:34 das Exp $
d324 4
a327 4
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} @@EXTRA_CC_SWITCHES@@
d329 1
a329 1
CC_SWITCHES = ${CC_SWITCHES_NO_STUBS} ${TCL_STUB_FLAGS} 
d331 3
a333 2
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} \
d901 1
a901 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
d909 1
a909 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(UNIX_DIR)/tkAppInit.c
d1038 1
a1038 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(GENERIC_DIR)/tkSquare.c
d1092 1
a1092 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(GENERIC_DIR)/tkOldTest.c
d1095 1
a1095 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(GENERIC_DIR)/tkTest.c
d1287 1
a1287 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(MAC_OSX_DIR)/tkMacOSXTest.c
@


1.130
log
@	* unix/Makefile.in: add datarootdir to silence autoconf-2.6x warning.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.129 2007/05/25 22:55:03 jenglish Exp $
d543 10
a552 3
HDRS = bltList.h \
	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
	tkPort.h tkScrollbar.h tkText.h
d752 1
a752 2
	@@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
		$(GENERIC_DIR)/tkPlatDecls.h $(@@TK_WINDOWINGSYSTEM@@_HDRS) ; \
d863 1
a863 3
	@@for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
		$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
		$(@@TK_WINDOWINGSYSTEM@@_PRIVATE_HDRS); \
@


1.129
log
@Removed ttk::dialog and dependencies.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128 2007/05/14 20:58:27 dgp Exp $
d39 1
@


1.128
log
@        [Tk Bug 1712081]

        * unix/Makefile.in:     Updates to account for new and deleted files
        * win/Makefile.in:      tkStubImg.c and tkOldTest.c.
        * win/makefile.bc:
        * win/makefile.vc:

        * generic/tkOldTest.c (new):    New file used to create testing
        * generic/tkTest.c:             commands for testing various Tk
        * tests/constraints.tcl:        legacy interfaces where a separate
        * tests/image.test:             compilation unit is needed in order
        to #define suitable macros during compilation.  Only the effect of
        USE_OLD_IMAGE on Tk_CreateImageType() is currently tested, but more
        similar testing commands can be added to this same file.  New
        constraint defined to detect presence of the image type provided by
        the new testing code, and a few tests added to exercise it.  Having
        USE_OLD_IMAGE support tested by the default test suite should reduce
        chance of a recurrence of this bug.

        * doc/CrtImgType.3:     Revised docs to better indicate the legacy
        * doc/CrtPhImgFmt.3:    nature of the interfaces supported by
        USE_OLD_IMAGE.

        * generic/tkDecls.h:    make genstubs
        * generic/tkStubInit.c:

        * generic/tk.decls:             Reworked USE_OLD_IMAGE support to use
        * generic/tk.h:                 the same support mechanisms both with
        * generic/tkStubImg.c (deleted):and without a stub-enabled build.  In
        each case, route the legacy calls to Tk_CreateImageType and
        Tk_CreatePhotoImageFormat through the Tk_CreateOldImageType and
        Tk_CreateOldPhotoImageFormat routines.  Add those routines to the
        public stub table so they're available to a stub-enabled extension.
        Remove the definition of Tk_InitImageArgs() and use a macro to
        convert any calls to it in source code into a comment.

        * generic/tkImage.c:    Removed the MODULE_SCOPE declarations that
        * generic/tkImgPhoto.c: broke USE_OLD_IMAGE support.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.127 2007/04/26 21:02:27 hobbs Exp $
a837 1
	    if [ "ttk_dialog.n" = `basename $$i` ] ; then continue ; fi ; \
@


1.128.2.1
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.129 2007/05/25 22:55:03 jenglish Exp $
d838 1
@


1.128.2.2
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.1 2007/05/26 04:06:07 dgp Exp $
a38 1
datarootdir		= @@datarootdir@@
@


1.128.2.3
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.2 2007/06/04 15:19:01 dgp Exp $
d543 3
a545 10
# Currently private, eventually public
TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h

PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
	$(GENERIC_DIR)/tkPlatDecls.h $(@@TK_WINDOWINGSYSTEM@@_HDRS)

# The private headers we want installed for install-private-headers
PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
	$(TTK_HDRS) $(@@TK_WINDOWINGSYSTEM@@_PRIVATE_HDRS)
d745 2
a746 1
	@@for i in $(PUBLIC_HDRS); \
d857 3
a859 1
	@@for i in $(PRIVATE_HDRS); \
@


1.128.2.4
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.3 2007/07/10 21:54:29 dgp Exp $
d324 4
a327 4
-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
-I${TCL_PLATFORM_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} ${AC_FLAGS} \
${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
${NO_DEPRECATED_FLAGS} @@EXTRA_CC_SWITCHES@@
d329 1
a329 1
CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} 
d331 2
a332 3
APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @@EXTRA_APP_CC_SWITCHES@@

DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
d900 1
a900 1
	$(CC) -c $(APP_CC_SWITCHES) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
d908 1
a908 1
	$(CC) -c $(APP_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
d1037 1
a1037 1
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkSquare.c
d1091 1
a1091 1
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkOldTest.c
d1094 1
a1094 1
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkTest.c
d1286 1
a1286 1
	$(CC) -c $(APP_CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXTest.c
@


1.128.2.5
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.4 2007/09/04 17:44:24 dgp Exp $
d1506 2
a1507 4
		$(UNIX_DIR)/aclocal.m4 $(MAC_OSX_DIR)/configure
	cd $(MAC_OSX_DIR); autoheader; touch $@@
$(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac
	cd $(MAC_OSX_DIR); autoconf
d1509 1
a1509 1
dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure
@


1.128.2.6
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.5 2007/09/04 18:48:13 dgp Exp $
d1511 1
a1511 1
dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure genstubs
@


1.128.2.7
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.6 2007/09/04 19:21:24 dgp Exp $
d1505 4
a1508 1
$(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
a1509 2
$(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
	cd $(MAC_OSX_DIR); autoheader; touch $@@
@


1.128.2.8
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.7 2007/09/06 18:23:55 dgp Exp $
d1170 1
a1170 1
tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
d1246 1
a1246 1
tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
@


1.128.2.9
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.8 2007/09/07 01:25:37 dgp Exp $
d709 3
a711 2
	    echo "if {[catch {package present Tcl\
		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
d713 1
a713 1
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
@


1.128.2.10
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.9 2007/09/11 18:32:36 dgp Exp $
d213 1
a213 1
INSTALL_STRIP_LIBRARY   = -S -x
d558 1
a558 1
	@@LD_LIBRARY_PATH_VAR@@="`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}"; \
d617 1
a617 1
	$(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)"
d673 1
a673 1
	@@echo "set env @@LD_LIBRARY_PATH_VAR@@=\"`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}\"" > gdb.run
d693 1
a693 1
	@@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \
d695 1
a695 1
	    if [ ! -d "$$i" ] ; then \
d697 2
a698 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d707 1
a707 1
	    rm -f "$(PKG_INDEX)"; \
d714 1
a714 1
	    ) > "$(PKG_INDEX)"; \
d718 1
a718 1
	@@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
d722 1
a722 1
			"$(LIB_INSTALL_DIR)"/$(TK_EXP_FILE); \
d725 1
a725 1
	@@$(INSTALL_PROGRAM) wish "$(BIN_INSTALL_DIR)"/wish$(VERSION)
d727 1
a727 1
	@@$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)"/tkConfig.sh
d736 4
a739 4
	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
		"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"/images \
		"$(SCRIPT_INSTALL_DIR)"/msgs "$(SCRIPT_INSTALL_DIR)"/ttk; \
d741 1
a741 1
	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
d743 2
a744 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d754 1
a754 1
	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
d758 1
a758 1
	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
d764 1
a764 1
	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
d770 1
a770 1
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/ttk; \
d777 1
a777 1
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/images; \
d784 1
a784 1
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/msgs; \
d789 3
a791 3
	@@for i in "$(SCRIPT_INSTALL_DIR)" \
		"$(SCRIPT_INSTALL_DIR)"/demos \
		"$(SCRIPT_INSTALL_DIR)"/demos/images ; \
d793 1
a793 1
	    if [ ! -d "$$i" ] ; then \
d795 2
a796 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d805 1
a805 1
			$$i > "$(SCRIPT_INSTALL_DIR)"/demos/`basename $$i`; \
d810 1
a810 1
	    chmod 755 "$(SCRIPT_INSTALL_DIR)"/demos/$$i; \
d816 1
a816 1
		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/demos/images; \
d824 1
a824 1
	@@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
d826 1
a826 1
	    if [ ! -d "$$i" ] ; then \
d828 2
a829 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d835 1
a835 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
d840 1
a840 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
d845 1
a845 1
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
d850 1
a850 1
	@@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
d852 1
a852 1
	    if [ ! -d "$$i" ] ; then \
d854 2
a855 2
		mkdir -p "$$i"; \
		chmod 755 "$$i"; \
d865 1
a865 1
	    $(INSTALL_DATA) $$i "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
d868 1
a868 1
	    $(INSTALL_DATA) tkConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
d1680 1
a1680 1
	"$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \
@


1.128.2.11
log
@merge updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.128.2.10 2008/03/13 14:57:34 dgp Exp $
d373 3
a375 1
	ttkWidget.o ttkStubInit.o
d379 1
a379 1
STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o
d403 1
a403 1
	$(STUB_OBJS) $(TTK_OBJS) \
@


1.127
log
@fix tests/ttk dist src
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.126 2007/04/25 17:09:13 hobbs Exp $
d338 2
a339 1
TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o $(@@TK_WINDOWINGSYSTEM@@_TKTEST_OBJS)
d377 1
a377 1
STUB_LIB_OBJS = tkStubLib.o tkStubImg.o
d447 1
a447 1
	$(GENERIC_DIR)/tkOldConfig.c \
d1086 3
a1124 3
tkStubImg.o: $(GENERIC_DIR)/tkStubImg.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubImg.c

@


1.126
log
@	* unix/Makefile.in (dist): add tests/ttk dir to src dist
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.125 2007/04/25 03:40:59 das Exp $
d1623 1
a1623 1
	cp -p $(TEST_DIR)/*.{test,tcl} $(DISTDIR)/tests/ttk
@


1.125
log
@	* unix/Makefile.in (dist): copy license.terms to dist macosx dir; fix autoheader bits.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.124 2007/04/25 02:49:25 das Exp $
d1619 2
a1620 4
	cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.test \
		$(TEST_DIR)/*.tcl $(TEST_DIR)/README \
		$(TEST_DIR)/*.gif $(TEST_DIR)/*.ppm \
		$(TEST_DIR)/*.xbm \
d1622 2
@


1.124
log
@	* unix/Makefile.in (dist): add macosx/*.xcconfig files to src dist.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.123 2007/04/24 15:55:50 hobbs Exp $
d1496 2
a1497 1
$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4
d1499 3
a1501 2
$(UNIX_DIR)/tkConfig.h.in: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4
	cd $(UNIX_DIR); autoheader
d1503 1
a1503 1
dist:   $(UNIX_DIR)/configure
d1512 2
a1513 1
		$(UNIX_DIR)/README $(UNIX_DIR)/installManPage $(DISTDIR)/unix
d1532 2
a1533 2
	cp -p $(GENERIC_DIR)/ttk/*.[ch] $(GENERIC_DIR)/ttk/ttk.decls \
		$(GENERIC_DIR)/ttk/ttkGenStubs.tcl $(DISTDIR)/generic/ttk
d1555 6
a1560 4
	cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \
		$(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.[chr] \
		$(TOP_DIR)/macosx/*.in $(TOP_DIR)/macosx/*.ac \
		$(TOP_DIR)/macosx/*.xcconfig $(DISTDIR)/macosx
d1562 1
a1562 1
	cp -p $(TOP_DIR)/macosx/Wish.pbproj/*.pbx* $(DISTDIR)/macosx/Wish.pbproj
d1564 1
a1564 1
	cp -p $(TOP_DIR)/macosx/Wish.xcode/*.pbx* $(DISTDIR)/macosx/Wish.xcode
d1566 1
a1566 1
	cp -p $(TOP_DIR)/macosx/Wish.xcodeproj/*.pbx* \
d1573 1
a1573 1
	cp -p $(TOP_DIR)/xlib/*.[ch] $(DISTDIR)/xlib
d1576 1
a1576 1
	cp -p $(TOP_DIR)/xlib/X11/*.h $(DISTDIR)/xlib/X11
@


1.123
log
@	* unix/Makefile.in (dist): add ttk bits to src dist
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.122 2007/04/23 21:24:35 das Exp $
d1554 2
a1555 1
		$(TOP_DIR)/macosx/*.in $(TOP_DIR)/macosx/*.ac $(DISTDIR)/macosx
@


1.122
log
@	* macosx/tkMacOSXCarbonEvents.c: add window event target carbon event
	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events;
	* macosx/tkMacOSXNotify.c:	 move all remaining events except for
	* macosx/tkMacOSXWindowEvent.c:	 kEventClassKeyboard from dispatcher to
	application event handler; pass event handler callRef downstream; fix
	debug event tracing; process all tcl event types in carbon event timer;
	delay carbon event timer first fire; add TkMacOSXTrackingLoop() to mark
	enter/exit of event tracking loop during which all tcl events but only
	carbon update events should be processed by the timer (replaces various
	calls to Tcl_SetServiceMode()); rename TkMacOSXReceiveAndProcessEvent()
	to TkMacOSXReceiveAndDispatchEvent(), move it from tkMacOSXEvent.c to
	tkMacOSXCarbonEvents.c and modify it to dequeue only update events
	during a tracking loop; add TkMacOSXRunTclEventLoop() to standardize
	the various ways in use to run the tcl event loop; add handling of
	kEventClassAppearance events (for ScrollBarVariantChanged event).

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXTrackingLoop() around
	* macosx/tkMacOSXEvent.c:	blocking API that puts up modal dialogs
	* macosx/tkMacOSXMenu.c:	or when entering/exiting menu/control
	* macosx/tkMacOSXMouseEvent.c:	tracking, window dragging and other
	* macosx/tkMacOSXScale.c:	mouse tracking loops.
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXRunTclEventLoop()
	* macosx/tkMacOSXScale.c:	instead of Tcl_DoOneEvent(),
	* macosx/tkMacOSXScrlbr.c:	Tcl_ServiceAll(), TclServiceIdle()
	* macosx/tkMacOSXWindowEvent.c:	and Tcl_GlobalEval("update idletasks").

	* macosx/tkMacOSXColor.c: make available as Tk system colors all
	* macosx/tkMacOSXPort.h:  appearance manager brushes, text colors and
	backgrounds with new and legacy names, as well as the fully transparent
	color "systemTransparent"; add TkMacOSXSetColorIn{Port,Context}() to
	directly set an X pixel color value in the current QD port resp. the
	given CG context without requiring passage through rgb representation
	(lossy for most system colors); modernize/remove Classic-era code;
	replace crufty strcmp() elseifs by Tcl_GetIndexFromObjStruct().

	* macosx/tkMacOSXButton.c:	use new TkMacOSXSetColorInPort()
	* macosx/tkMacOSXDraw.c:	instead of setting rgb color directly
	* macosx/tkMacOSXMenubutton.c:	to allow for non-rgb system colors.

	* macosx/tkMacOSXCursor.c: implement "none" cursor as on other
	platforms [Patch 1615427]; add all missing appearance manager cursors.

	* macosx/tkMacOSXDefault.h: set SELECT_FG_COLORs to None to match aqua
	L&F; use standard system color names; use new 'menu' system font;
	correct default scrollbar width.

	* macosx/tkMacOSXDraw.c:	standardize initialization, use and
	* macosx/tkMacOSXInt.h:		emptying of various static temp rgns
	* macosx/tkMacOSXRegion.c:	onto two global RgnHandles; in debug
	* macosx/tkMacOSXSubwindows.c:	builds, verify emptiness of these temp
	* macosx/tkMacOSXWindowEvent.c:	rgns before use.

	* macosx/tkMacOSXDraw.c: add TkMacOSX{Setup,Restore}DrawingContext() to
	* macosx/tkMacOSXInt.h:  abstract common setup & teardown of drawing
	environment (for both CG and QD); save/restore QD theme drawing state;
	handle GC clip region; add TkpClipDrawableToRect() to allow clipped
	drawing into drawable regardless of GC used; use new system color
	"systemWindowHeaderBackground" to setup background in themed toplevels;
	correct implementation of TkMacOSXMakeStippleMap().

	* macosx/tkMacOSXEntry.c:  use new TkMacOSXSetupDrawingContext() and
	* macosx/tkMacOSXFont.c:   TkMacOSXRestoreDrawingContext() instead of
	* macosx/ttkMacOSXTheme.c: various setup/teardown procs like
	TkMacOSX{SetUp,Release}CGContext(), TkMacOSXQuarz{Start,End}Draw(),
	TkMacOSXSetUpGraphicsPort() etc.

	* macosx/tkMacOSXEmbed.c: add CG context and drawable clip rgn fields
	* macosx/tkMacOSXInt.h:   to MacDrawable struct.
	* macosx/tkMacOSXSubwindows.c:

	* macosx/tkMacOSXDialog.c: make -parent option of tk_getOpenFile et al.
	use the sheet version of NavServices dialogs; ensure native parent win
	exists before using StandardSheet API for tk_messageBox [Bug 1677611];
	force sheets to behave like app-modal dialogs via WindowModality() API;
	use more modern ColorPicker API.

	* macosx/tkAboutDlg.r: use themed movable modal dialog, fix (c) year.

	* macosx/tkMacOSXEntry.c:  take xOff/yOff of MacDrawable into account
	* macosx/ttkMacOSXTheme.c: when computing locations/bounds to ensure
	correct posititioning when not drawing into intermediate pixmap.

	* macosx/tkMacOSXFont.c: use appearance manager API to map system font
	* macosx/tkMacOSXFont.h: names to TkFonts; add "menu" system font for
	menu item text drawing from MDEF; always draw with CG; remove QD
	dependent stippling algorithm; move most header declarations into the
	source file (as they were not used anywhere else).

	* macosx/tkMacOSXMenu.c:		 large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	 MDEF and related code that
	* macosx/Wish.xcode/project.pbxproj:	 restores many longtime-MIA
	* macosx/Wish.xcodeproj/project.pbxproj: features to working order
	* unix/Makefile.in:			 (e.g. images, custom colors &
	fonts in menus etc); implement compound menu items; use Appearance Mgr
	and ThemeText APIs to mimic native MDEF as closely as possible when
	default "menu" system font is used; remove now obsolete SICN drawing
	code and resources.

	* macosx/tkMacOSXCarbonEvents.c: handle additional menu carbon events
	* macosx/tkMacOSXEvent.c:	 in order to support <<MenuSelect>> in
	* macosx/tkMacOSXMenu.c:	 the menubar and in menus that are not
	* macosx/tkMacOSXMenus.c:	 using the custom MDEF [Bug 1620826];
	fix early and missing clearing of current Tk active menu entry; fix
	extraneous sending of <<MenuSelect>> during active menu entry clearing.

	* macosx/tkMacOSXMouseEvent.c: add support for async window dragging by
	the window server; set the corresponding window attribute by default.

	* macosx/tkMacOSXMouseEvent.c: rationalized handling order of
	non-mousedown events; add TkMacOSXModifierState() to retrieve the
	current key modifiers in carbon format.

	* macosx/tkMacOSXScrlbr.c: use appearance manager API to retrieve
	scrollbar component metrics; add awareness of multiple possibilites for
	scrollbar arrow position in aqua and handle user changes to arrow
	position pref; handle difference in metrics of small & large scrollbar
	variants; handle aqua "jump to here" scrollbar behaviour; correct
	computation of scroll view size and position; enforce min scrollbar
	height to avoid scrollbar component overlap; erase scrollbar area
	outside of standard width; remove broken auto-adjust code; account for
	window class when leaving space for grow box; remove code to manually
	draw grow box; use modern API for thumb scroll proc; replace
	HiliteControl() by modern API; replace control mgr constants with
	appearance mgr equivalents.

	* macosx/tkMacOSXSubwindows.c: use SetWindowBounds() API instead of
	SizeWindow(); invalidate clip regions after X{Map,Unmap}Window as fix
	for [Bug 940117] made them dependent on mapping state; remove unneeded
	calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD port;
	use native-endian pixmap on intel; remove obsolete pixmap pix locking.

	* macosx/tkMacOSXWindowEvent.c: handle only the first of a batch of
	kEventAppAvailableWindowBoundsChanged events sent per transaction;
	handle kEventWindowBoundsChanged event to support live window resizing
	and centralized sending of location/size changed ConfigureNotify
	events; ensure HIGrowBox is redrawn after bounds change; constrain
	window after dragging to ensure titlebar is not inacessible
	offscreen or under dock/menubar; handle kEventWindowGetRegion and
	kEventWindowDrawContent for transparent windows to mark resp. paint
	content region as transparent; handle kEventWindowConstrain for
	fullscreen windows to ensure bounds match new screen size; enter/exit
	fullscreen UIMode upon activation/deactivation of fullscreen window.

	* macosx/tkMacOSXWm.c: use live-resize and async-drag carbon window
	* macosx/tkMacOSXWm.h: attributes for toplevels by default; implement
	new [wm attributes] -topmost, -transparent and -fullscreen; refactor
	WmAttributesCmd() parallelling the tkUnixWm.c implementation, use thus
	factored proc to set proxy icon from [wm iconbitmap]; dynamically
	determine default values for toplevel min and max sizes (similar to
	tkWinWm.c impl): min sizes depend on window class & attributes to
	ensure visibility of all titlebar widgets and grow box, max sizes
	depend on maximal window bounds for all active displays; factor out
	code that puts into effect changes to master or override_redirect; use
	RepositionWindow() API to determine staggered initial window bounds;
	correct resize limit calculations, handle gridding and use modern
	resize API in TkMacOSXGrowToplevel(); remove sending of ConfigureNotify
	after resize or zoom (now handled by BoundsChanged handler); correct
	composite carbon window attribute handling, remove currently unusable
	attributes and add new attributes in [tk::unsupported::MacWindowStyle];
	ensure validity of window class and attributes before use; apply
	changes to window class when handling carbon window attribute changes
	(if HIWindowChangeClass() API available); add debug build warning
	message when deprecated window style is used instead of window class;
	use transparent HIGrowBox for resizable windows; avoid unnecessary
	calls to window structure width API; use tcl time API in TkpGetMS();
	add TkMacOSXEnterExitFullscreen() to enter/exit UIMode with dock and
	menubar hidden; restrict wmTracing output to debug builds; remove
	unneeded calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD
	port; workaround GetWindowStructureWidths() Carbon bug (bogus results
	for never-mapped floating windows).

	* macosx/tkMacOSXXStubs.c (TkMacOSXDisplayChanged): add maximal window
	bounds field to Screen record (in ext_data), computed as the union of
	available window positioning bounds of all graphics devices (displays).

	* macosx/tkMacOSXBitmap.c: fix macRoman encoding leak.
	* macosx/tkMacOSXCursor.c:

	* macosx/tkMacOSXDebug.c (TkMacOSXCarbonEventToAscii): use static
	* macosx/tkMacOSXDebug.h: buffer to simplify callers; const fixes.

	* macosx/tkMacOSXBitmap.c: use more efficient QDSwapPort() instead of
	* macosx/tkMacOSXButton.c: GetPort()/SetPort()/GetGWorld()/SetGWorld().
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXColor.c: use kHIToolboxVersionNumber for runtime OS
	* macosx/tkMacOSXEntry.c: version check rather than Gestalt() etc.
	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDraw.c: remove obsolete and now incorrect
	* macosx/tkMacOSXInt.h:  tkMenuCascadeRgn clipping code.
	* macosx/tkMacOSXMenu.c:

	* macosx/tkMacOSXHLEvents.c: replace Tcl_GlobalEval() resp. Tcl_Eval()
	* macosx/tkMacOSXScrlbr.c:   by Tcl_EvalEx().
	* macosx/tkMacOSXInit.c:

	* macosx/tkMacOSXInit.c (TkpInit): reorder initialization steps.

	* macosx/tkMacOSXKeyEvent.c: remove pre-10.2 support.

	* macosx/tkMacOSXMenus.c: remove now useless call to
	TkMacOSXHandleTearoffMenu(); use \x.. quoting for non-latin1 macroman
	literar chars to allow file to be edited as utf-8.

	* macosx/tkMacOSXScale.c: replace TrackControl() by modern
	* macosx/tkMacOSXScrlbr.c: HandleControlClick() API (using new
	TkMacOSXModifierState()).

	* macosx/tkMacOSXInt.h:		move all constant #defines needed to
	* macosx/tkMacOSXColor.c:	support building on older OS X releases
	* macosx/tkMacOSXEvent.h:	to a central location in tkMacOSXInt.h.
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/ttkMacOSXTheme.c:

	* macosx/tkMacOSXInt.h:		 add ChkErr() macro to factor out
	* macosx/tkMacOSXButton.c:	 Carbon OSStatus return value checking
	* macosx/tkMacOSXCarbonEvents.c: and TkMacOSXDbgMsg() macro to factour
	* macosx/tkMacOSXClipboard.c:	 out debug message output; use these
	* macosx/tkMacOSXColor.c:	 macros to replace #ifdef TK_MAC_DEBUG
	* macosx/tkMacOSXCursor.c:	 blocks & direct printing to stderr,
	* macosx/tkMacOSXDebug.c:	 and to do additional OSStatus return
	* macosx/tkMacOSXDialog.c:	 checking, and to standardize OSStatus
	* macosx/tkMacOSXDraw.c:	 usage.
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXHLEvents.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXSend.c:	remove duplicate/unused declarations
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXDebug.c:	const fixes.
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXTest.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/Wish-Info.plist.in: add tcl document extensions/mime types and
	LSMinimumSystemVersion, LSRequiresCarbon & NSAppleScriptEnabled keys.

	* macosx/Wish-Common.xcconfig: add Wish's Info.plist as __info_plist
	section to tktest; enable more warnings.

	* macosx/Wish.xcodeproj/project.pbxproj: add 'DebugMemCompile' build
	configuration that calls configure with --enable-symbols=all; disable
	configure check for __attribute__((__visibility__("hidden"))) in Debug
	configuration to restore availability of ZeroLink.

	* macosx/Wish-Common.xcconfig:	fix whitespace.
	* macosx/Wish-Debug.xcconfig:
	* macosx/Wish-Release.xcconfig:
	* macosx/tkMacOSXAETE.r:
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/ttkMacOSXTheme.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/GNUmakefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/Wish.xcode/project.pbxproj:
	* macosx/Wish.xcodeproj/project.pbxproj:
	* macosx/tkMacOSX.h:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.121 2007/03/07 23:46:33 das Exp $
d1521 1
a1521 2
	cp -p $(GENERIC_DIR)/*.c $(GENERIC_DIR)/*.h $(GENERIC_DIR)/prolog.ps \
		$(DISTDIR)/generic
d1528 3
d1538 1
a1538 2
	cp -p $(TOP_DIR)/win/*.c $(TOP_DIR)/win/*.h $(DISTDIR)/win
	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
d1548 1
a1548 3
	cp -p $(TOP_DIR)/win/rc/*.rc $(TOP_DIR)/win/rc/*.cur \
		$(TOP_DIR)/win/rc/*.ico $(TOP_DIR)/win/rc/*.bmp \
		$(DISTDIR)/win/rc
d1553 2
a1554 3
		$(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.c \
		$(TOP_DIR)/macosx/*.h $(TOP_DIR)/macosx/*.in \
		$(TOP_DIR)/macosx/*.r $(TOP_DIR)/macosx/*.ac $(DISTDIR)/macosx
d1567 1
a1567 1
	cp -p $(TOP_DIR)/xlib/*.h $(TOP_DIR)/xlib/*.c $(DISTDIR)/xlib
d1576 2
@


1.121
log
@	* generic/tkMain.c (Tk_MainEx): replicate macosx-specific code from
	TkpInit() that ensures the console window appears when wish is started
	from the OS X Finder (i.e. with stdin == /dev/null), jeffh's 2006-11-24
	change rendered the corresponding code in TkpInit() ineffective in wish
	because Tk_MainEx() sets tcl_interactive before calling TkpInit().

	* generic/ttk/ttkGenStubs.tcl (new): add ttk-specific genstubs.tcl from
	* unix/Makefile.in (genstubs):       tile and run it from 'genstubs'
	target, restores ability to generate all of Tk's stub sources.

	* generic/ttk/ttkTreeview.c: #ifdef out unused declaration.

	* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol): add fix for
	libraries loaded with a DYLD_IMAGE_SUFFIX.

	* macosx/Wish.xcodeproj/project.pbxproj: ensure gcc version used by
	* macosx/Wish.xcodeproj/default.pbxuser: Xcode and configure/make are
	* macosx/Wish-Common.xcconfig:		 consistent and independent of
	gcc_select default and CC env var; fixes for Xcode 3.0.

	* unix/tcl.m4 (Darwin): s/CFLAGS/CPPFLAGS/ in macosx-version-min check.
	* unix/configure: autoconf-2.59
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.120 2006/12/13 23:04:33 hobbs Exp $
d529 1
a529 1
	$(MAC_OSX_DIR)/tkMacOSXMenu.r $(MAC_OSX_DIR)/tkMacOSXXCursors.r
@


1.120
log
@	* unix/Makefile.in (install-doc): intentionally skip ttk_dialog.n
	installation (not for public consumption)

	* doc/scrollbar.n, doc/button.n, doc/checkbutton.n:
	* doc/entry.n, doc/frame.n, doc/label.n, doc/labelframe.n:
	* doc/menu.n, doc/menubutton.n, doc/panedwindow.n:
	* doc/radiobutton.n, doc/scrollbar.n, doc/ttk_*: revamp ttk docs
	to use consist nroff format (not 100% consistent with classic
	widget docs).  Add more man page cross-linking "SEE ALSO".
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.119 2006/12/13 20:38:28 hobbs Exp $
d1433 1
a1433 2
# Need the Ttk specific genstubs as well
#	$(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(TTK_DIR) $(TTK_DIR)/ttk.decls
@


1.119
log
@	* win/Makefile.in, unix/Makefile.in (demo): add 'demo' target
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.118 2006/10/31 13:56:59 das Exp $
d837 1
@


1.118
log
@	* macosx/Wish.xcodeproj/project.pbxproj: add new Ttk files.

	* macosx/ttkMacOSXTheme.c: standardize header #includes.

	* unix/Makefile (checkstubs, checkexports): check ttk.decls, allow
	export of Ttk prefixed symbols.

	* generic/ttk/tkDefaultTheme.c: fix warnings.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.117 2006/10/31 01:42:27 hobbs Exp $
d658 3
@


1.117
log
@	* doc/ttk_Geometry.3, doc/ttk_Theme.3, doc/ttk_button.n:
	* doc/ttk_checkbutton.n, doc/ttk_combobox.n, doc/ttk_dialog.n:
	* doc/ttk_entry.n, doc/ttk_frame.n, doc/ttk_image.n:
	* doc/ttk_intro.n, doc/ttk_label.n, doc/ttk_labelframe.n:
	* doc/ttk_menubutton.n, doc/ttk_notebook.n, doc/ttk_panedwindow.n:
	* doc/ttk_progressbar.n, doc/ttk_radiobutton.n, doc/ttk_scrollbar.n:
	* doc/ttk_separator.n, doc/ttk_sizegrip.n, doc/ttk_style.n:
	* doc/ttk_treeview.n, doc/ttk_widget.n,:
	* generic/ttk/ttk.decls, generic/ttk/ttkBlink.c:
	* generic/ttk/ttkButton.c, generic/ttk/ttkCache.c:
	* generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c:
	* generic/ttk/ttkDecls.h, generic/ttk/ttkDefaultTheme.c:
	* generic/ttk/ttkElements.c, generic/ttk/ttkEntry.c:
	* generic/ttk/ttkFrame.c, generic/ttk/ttkImage.c:
	* generic/ttk/ttkInit.c, generic/ttk/ttkLabel.c:
	* generic/ttk/ttkLayout.c, generic/ttk/ttkManager.c:
	* generic/ttk/ttkManager.h, generic/ttk/ttkNotebook.c:
	* generic/ttk/ttkPanedwindow.c, generic/ttk/ttkProgress.c:
	* generic/ttk/ttkScale.c, generic/ttk/ttkScroll.c:
	* generic/ttk/ttkScrollbar.c, generic/ttk/ttkSeparator.c:
	* generic/ttk/ttkSquare.c, generic/ttk/ttkState.c:
	* generic/ttk/ttkStubInit.c, generic/ttk/ttkStubLib.c:
	* generic/ttk/ttkTagSet.c, generic/ttk/ttkTheme.c:
	* generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h:
	* generic/ttk/ttkTrace.c, generic/ttk/ttkTrack.c:
	* generic/ttk/ttkTreeview.c, generic/ttk/ttkWidget.c:
	* generic/ttk/ttkWidget.h:
	* library/demos/ttk_demo.tcl, library/demos/ttk_iconlib.tcl:
	* library/demos/ttk_repeater.tcl:
	* library/ttk/altTheme.tcl, library/ttk/aquaTheme.tcl:
	* library/ttk/button.tcl, library/ttk/clamTheme.tcl:
	* library/ttk/classicTheme.tcl, library/ttk/combobox.tcl:
	* library/ttk/cursors.tcl, library/ttk/defaults.tcl:
	* library/ttk/dialog.tcl, library/ttk/entry.tcl:
	* library/ttk/fonts.tcl, library/ttk/icons.tcl:
	* library/ttk/keynav.tcl, library/ttk/menubutton.tcl:
	* library/ttk/notebook.tcl, library/ttk/panedwindow.tcl:
	* library/ttk/progress.tcl, library/ttk/scale.tcl:
	* library/ttk/scrollbar.tcl, library/ttk/sizegrip.tcl:
	* library/ttk/treeview.tcl, library/ttk/ttk.tcl:
	* library/ttk/utils.tcl, library/ttk/winTheme.tcl:
	* library/ttk/xpTheme.tcl:
	* macosx/ttkMacOSXTheme.c:
	* tests/ttk/all.tcl, tests/ttk/bwidget.test, tests/ttk/combobox.test:
	* tests/ttk/entry.test, tests/ttk/image.test:
	* tests/ttk/labelframe.test, tests/ttk/layout.test:
	* tests/ttk/misc.test, tests/ttk/notebook.test:
	* tests/ttk/panedwindow.test, tests/ttk/progressbar.test:
	* tests/ttk/scrollbar.test, tests/ttk/treetags.test:
	* tests/ttk/treeview.test, tests/ttk/ttk.test, tests/ttk/validate.test:
	* win/ttkWinMonitor.c, win/ttkWinTheme.c, win/ttkWinXPTheme.c:
	First import of Ttk themed Tk widgets as branched from tile 0.7.8

	* generic/tkInt.h, generic/tkWindow.c: add Ttk_Init call, copy
	tk classic widgets to ::tk namespace.
	* library/tk.tcl: add source of ttk/ttk.tcl, define $::ttk::library.
	* unix/Makefile.in, win/Makefile.in: add Ttk build bits
	* win/configure, win/configure.in: check for uxtheme.h (XP theme).
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.116 2006/09/27 18:43:35 andreas_kupries Exp $
d1442 1
a1442 1
		for j in $(TK_DECLS); do \
d1458 2
a1459 2
# Target to make sure that only symbols with "Tk" prefixes are
# exported.
d1465 1
a1465 1
	| sort -n | grep -E -v '^([Tt]k|_?X)' || true
@


1.116
log
@
	* unix/Makefile.in (install-binaries): Added a second guard to the
	* win/Makefile.in: package index file to prevent older versions of
	* win/makefile.vc: Tcl from seeing version numbers which may
	  contain a/b information, and then balking on them. This could
	  otherwise happen when Tcl/Tk 8.4 and 8.5 are installed in the
	  same directory, seeing each other. [SF Tk Bug 1566418].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.115 2006/09/22 19:02:07 andreas_kupries Exp $
d302 1
d306 1
d363 11
d394 2
a395 1
	xcolors.o xdraw.o xgc.o ximage.o xutil.o
d400 2
a401 1
	$(STUB_OBJS) $(@@TK_WINDOWINGSYSTEM@@_OBJS) @@PLAT_OBJS@@
d407 3
d450 34
d522 2
a523 1
	$(XLIB_DIR)/xgc.c $(XLIB_DIR)/ximage.c $(XLIB_DIR)/xutil.c
d547 6
d629 8
a636 6
test: tktest
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
d641 1
a641 4
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
d645 1
a645 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
d651 1
a651 5
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
	./tktest
d656 1
a656 5
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
	./wish $(SCRIPT)
d727 1
a727 1
		$(SCRIPT_INSTALL_DIR)/msgs; \
d755 7
d1312 96
d1421 5
d1429 2
d1610 5
a1614 5
	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/tests/*.test \
		$(TOP_DIR)/tests/*.tcl $(TOP_DIR)/tests/README \
		$(TOP_DIR)/tests/*.gif $(TOP_DIR)/tests/*.ppm \
		$(TOP_DIR)/tests/*.xbm \
		$(TOP_DIR)/tests/option.file* $(DISTDIR)/tests
d1663 1
a1663 3
	@@LD_LIBRARY_PATH_VAR@@=$(TCL_BIN_DIR):$${@@LD_LIBRARY_PATH_VAR@@}; export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TCLSH="$(BUILD_TCLSH)"; else \
@


1.115
log
@
	* generic/tkConsole.c: TIP #268 update regarding registered package
	* generic/tkMain.c:    version, now using full patchlevel instead of
	* generic/tkWindow.c:  major.minor
	* library/tk.tcl:
	* unix/configure:
	* unix/Makefile.in:
	* unix/tcl.m4:
	* win/configure:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rules.vc:
	* win/tcl.m4:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.114 2006/04/11 18:09:07 dgp Exp $
d646 1
@


1.114
log
@        * unix/Makefile.in:     Updated `make dist` target to be sure the
        message catalogs for the widget demo get packaged into the source
        code distribution.  [Bug 1466509]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.113 2006/03/08 22:54:05 dgp Exp $
d13 1
d647 1
a647 1
		$(TCLVERSION)] != 0} { return }";\
d649 1
a649 1
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
@


1.113
log
@more images copied into dist
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.112 2006/03/08 22:17:29 dgp Exp $
d1427 1
@


1.112
log
@        * unix/Makefile.in:     Update `make dist` to copy the image files
        needed by the test suite into the source distro.  This was overlooked
        in the 2005-10-12 commit.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.111 2005/12/09 00:48:54 das Exp $
d1449 2
a1450 1
		$(TOP_DIR)/tests/*.gif \
@


1.111
log
@	* generic/tkInt.decls:   move all platform test sources from tk lib into
	* generic/tkTest.c:      tktest directly, removes requirement to export
	* macosx/tkMacOSXTest.c: TkplatformtestInit from internal stubs table.
	* unix/Makefile.in:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/tkWinTest.c:

	* generic/tkIntPlatDecls.h:
	* generic/tkStubInit.c: regen.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.110 2005/12/08 21:13:17 hobbs Exp $
d1449 1
@


1.110
log
@fix dist target for manifest dir change
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.109 2005/11/27 02:36:15 das Exp $
d335 1
a335 1
TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o
d377 1
a377 1
	tkMacOSXSubwindows.o tkMacOSXTest.o tkMacOSXWindowEvent.o \
d382 2
d1218 1
a1218 1
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXTest.c
@


1.109
log
@	* unix/tcl.m4 (Darwin): add 64bit support, check for Tiger copyfile(),
	add CFLAGS to SHLIB_LD to support passing -isysroot in env(CFLAGS) to
	configure (flag can't be present twice, so can't be in both CFLAGS and
	LDFLAGS during configure), don't use -prebind when deploying on 10.4,
	define TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING (rdar://3171542).
	(SC_ENABLE_LANGINFO, SC_TIME_HANDLER): add/fix caching, fix obsolete
	autoconf macros. Sync with tcl/unix/tcl.m4.

	* unix/configure.in: fix obsolete autoconf macros, sync gratuitous
	formatting/ordering differences with tcl/unix/configure.in.

	* unix/Makefile.in: add CFLAGS to wish/tktest link to make executable
	linking the same as during configure (needed to avoid loosing any linker
	relevant flags in CFLAGS, in particular flags that can't be in LDFLAGS).
	Avoid concurrent linking of wish and compiling of tkTestInit.o during
	parallel make, fix dependencies and flags for building tkMacOSXInit.o
	(checkstubs, checkexports): dependency and Darwin fixes
	(dist): add new macosx files.

	* macosx/tkMacOSXEvent.c (TkMacOSXProcessEvent):
	* macosx/tkMacOSXEvent.h:
	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent):
	* macosx/tkMacOSXCarbonEvents.c: install standard application event
	handler, add & call functions to start and stop carbon even timer that
	runs the tcl event loop periodically during a nested carbon event loop
	in the toolbox (e.g. during menutracking) to ensure tcl timers etc
	continue to fire, register app event handler for menu tracking and HI
	command carbon events, move menu event handling to new handlers for
	those carbon events, no longer register for/handle appleevent carbon
	event (now dealt with by standard application event handler), event
	debugging code dynamically acquires carbon event debugging functions to
	allow use on Tiger where they are no longer exported from HIToolbox.

	* macosx/tkMacOSXFont.c (TkMacOSXUseAntialiasedText):
	* macosx/tkMacOSXKeyEvent.c (GetKeyboardLayout):
	* macosx/tkMacOSXCarbonEvents.c (TkMacOSXInitCarbonEvents):
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXInt.h: abstract common code to dynamically acquire
	address of a named symbol (from a loaded dynamic library) into new
	function TkMacOSXGetNamedSymbol() and macro TkMacOSXInitNamedSymbol.

	* macosx/tkMacOSXMenu.c (TkpNewMenu):
	* macosx/tkMacOSXMenubutton.c (MenuButtonInitControl):
	* macosx/tkMacOSXMenus.c (TkMacOSXHandleMenuSelect): switch to  modern
	utf8 aware menu manager API, remove obsolete code, add error handling.

	* macosx/tkMacOSXMouseEvent.c: define OSX 10.3 or later only constants
	if necessary to allow compilation on OSX 10.2

	* macosx/tkMacOSXWm.c (UpdateSizeHints): remove code that is never
	executed.

	* xlib/xgc.c (XCreateGC): sync with core-8-4-branch change.

	* generic/tk.h: add/correct location of version numbers in macosx files.

	* generic/tkInt.h: clarify fat compile comment.

	* macosx/Wish.pbproj/default.pbxuser (new file):
	* macosx/Wish.pbproj/jingham.pbxuser:
	* macosx/Wish.pbproj/project.pbxproj:
	* macosx/Wish.xcode/default.pbxuser:
	* macosx/Wish.xcode/project.pbxproj:
	* macosx/Wish.xcodeproj/default.pbxuser (new file):
	* macosx/Wish.xcodeproj/project.pbxproj (new file): new/updated projects
	for Xcode 2.2 on 10.4, Xcode 1.5 on 10.3 & ProjectBuilder on 10.2, with
	native tktest targets and support for universal (fat) compiles.

	* macosx/Tk-Info.plist (removed):
	* macosx/Wish-Info.plist (removed):
	* macosx/buildTkConfig.tcl (removed): remove obsolete build files.

	* macosx/README: clarification/cleanup, document new Xcode projects and
	universal (fat) builds via CFLAGS (i.e. ppc and i386 at the same time).

	* unix/Makefile.in:
	* unix/aclocal.m4:
	* unix/configure.in:
	* macosx/configure.ac (new file): add support for inclusion of
	unix/configure.in by macosx/configure.ac, allows generation of a config
	headers enabled configure script in macosx (required by Xcode projects).

	* macosx/GNUmakefile: rename from Makefile to avoid overwriting by
	configure run in tk/macosx, add support for reusing configure cache,
	build target fixes.

	* generic/tk3d.h:
	* generic/tkButton.h:
	* generic/tkCanvas.c:
	* generic/tkCanvas.h:
	* generic/tkColor.h:
	* generic/tkEntry.h:
	* generic/tkFileFilter.h:
	* generic/tkFont.c:
	* generic/tkFont.h:
	* generic/tkImage.c:
	* generic/tkImgPhoto.c:
	* generic/tkInt.h:
	* generic/tkMenu.c:
	* generic/tkMenu.h:
	* generic/tkMenubutton.h:
	* generic/tkScale.h:
	* generic/tkScrollbar.h:
	* generic/tkSelect.h:
	* generic/tkStubInit.c:
	* generic/tkStubLib.c:
	* generic/tkText.h:
	* generic/tkUndo.h:
	* macosx/tkMacOSXButton.c:
	* macosx/tkMacOSXDebug.c:
	* macosx/tkMacOSXDebug.h:
	* macosx/tkMacOSXDialog.c:
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXSend.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:
	* unix/tkUnixButton.c:
	* unix/tkUnixMenu.c:
	* xlib/xgc.c: ensure externally visible symbols not contained in stubs
	table are declared as MODULE_SCOPE (or as static if not used outside of
	own source file), #ifdef out a few Xlib and aqua functions that are
	never called. These changes allow 'make checkstubs' to complete without
	error on Darwin with gcc 4.

	* macosx/tkMacOSXTest.c:
	* macosx/tkMacOSXPort.h:
	* win/tkWinTest.c:
	* generic/tkInt.decls: add functions needed by tktest to internal stubs
	table, correct signature of TkMacOSXHandleMenuSelect, add XSync to aqua
	Xlib stubs.

	* unix/tkUnixSend.c:
	* generic/tkText.c:
	* generic/tkTest.c: #ifdef unix only declarations.
	(TestmetricsCmd): unify win and mac implementation.
	(TestsendCmd): move to tkUnixSend.c to avoid access to global var.
	(TesttextCmd): move to tkText.c to avoid having to put all the internal
	text functions it uses into the stubs table.

	* generic/tkTextDisp.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXXStubs.c: fix gcc 4 warnings.

	* macosx/tkMacOSXNotify.c:
	* macosx/tkMacOSXScrlbr.c: sync with core-8-4-branch.

	* generic/tkIntDecls.h:
	* generic/tkIntPlatDecls.h:
	* generic/tkIntXlibDecls.h:
	* generic/tkStubInit.c:
	* unix/configure:
	* unix/tkConfig.h.in: regen.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.108 2005/08/25 04:13:42 das Exp $
d1379 1
a1379 1
	cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(DISTDIR)/win/rc/
d1384 1
a1384 1
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest
@


1.108
log
@	* unix/Makefile.in (html): reverted/amended changes of 2005-08-23
	that broke TkAqua 'make install'; added BUILD_HTML_FLAGS
	optional var like in tcl/unix/Makefile.in.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.107 2005/08/23 18:25:34 mdejong Exp $
d301 1
a301 1
UNIX_DIR		= $(SRC_DIR)
d535 1
a535 2
	$(CC) $(LDFLAGS) $(WISH_OBJS) \
		@@TK_BUILD_LIB_SPEC@@ \
d548 1
a548 1
	${CC} $(LDFLAGS) $(TKTEST_OBJS) @@TK_BUILD_LIB_SPEC@@ \
d556 1
a556 1
	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
d820 4
d825 1
a825 1
tkTestInit.o: $(UNIX_DIR)/tkAppInit.c
d1175 3
a1177 2
tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXInit.c
d1273 3
a1275 2
checkstubs:
	-@@for i in `nm -p $(TK_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \
d1279 1
a1279 1
		    if [ `grep -c $$i $$j` -gt 0 ]; then \
d1299 3
a1301 1
	-nm -p $(TK_LIB_FILE) | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Tt]k'
d1386 4
a1389 3
	cp -p $(TOP_DIR)/macosx/Makefile $(TOP_DIR)/macosx/Wish.icns \
		$(TOP_DIR)/macosx/*.c $(TOP_DIR)/macosx/*.h $(TOP_DIR)/macosx/*.in \
		$(TOP_DIR)/macosx/*.r $(TOP_DIR)/macosx/*.tcl $(DISTDIR)/macosx
d1391 6
a1396 3
	cp -p $(TOP_DIR)/macosx/Wish.pbproj/*.pbx* \
		$(DISTDIR)/macosx/Wish.pbproj
	cp -p $(TOP_DIR)/macosx/README $(DISTDIR)/macosx
@


1.107
log
@	* unix/Makefile.in: Subst BUILD_TCLSH and TCL_EXE.
	* unix/configure: Regen.
	* unix/configure.in: Update minimum autoconf version
	to 2.59. Invoke SC_PROG_TCLSH and SC_BUILD_TCLSH.
	* unix/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
	* win/Makefile.in: Subst BUILD_TCLSH and TCL_EXE.
	* win/configure: Regen.
	* win/configure.in: Update minimum autoconf version
	to 2.59. Invoke SC_BUILD_TCLSH.
	* win/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
	Split confused search for tclsh on PATH and
	build and install locations into two macros.
	SC_PROG_TCLSH searches just the PATH.
	SC_BUILD_TCLSH determines the name of the tclsh
	executable in the Tcl build directory.
	[Tcl bug 1160114]
	[Tcl patch 1244153]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.106 2005/07/05 20:56:50 dgp Exp $
d1484 7
a1490 4
	@@if test -f "$(TCL_EXE)"; then \
	$(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
		--srcdir=$(TOP_DIR)/.. ; \
	fi
@


1.106
log
@        * unix/Makefile.in:     Purged use of TCLTESTARGS [RFE 1161550].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.105 2005/05/25 20:32:33 hobbs Exp $
d190 15
a217 7
# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
# running make for the first time. Certain build targets (make genstubs)
# need it to be available on the PATH. This executable should *NOT* be
# required just to do a normal build although it can be required to run
# make dist.
TCL_EXE			= tclsh

d1484 4
a1487 7
	@@if test -f $(TCL_BIN_DIR)/tclsh; then \
	@@LD_LIBRARY_PATH_VAR@@=$(TCL_BIN_DIR):$${@@LD_LIBRARY_PATH_VAR@@}; export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TCLSH="$(TCL_BIN_DIR)/tclsh"; else \
	TCLSH="$(TCL_EXE)"; fi ;\
	$${TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
		--srcdir=$(TOP_DIR)/..
@


1.105
log
@	* unix/Makefile.in (install-libraries): protect possible empty
	list in for with list= trick for older shells.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.104 2005/05/24 00:32:55 das Exp $
d566 1
a566 1
	$(TESTFLAGS) $(TCLTESTARGS)
d578 1
a578 1
	$(TESTFLAGS) $(TCLTESTARGS); \
@


1.104
log
@small comments & whitespace fix
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.103 2005/05/23 20:24:59 das Exp $
d684 1
a684 1
	@@for i in $(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS) ; \
@


1.103
log
@	* macosx/Makefile:
	* macosx/README:
	* macosx/Tk-Info.plist.in (new file):
	* macosx/Wish-Info.plist.in (new file):
	* unix/Makefile.in:
	* unix/configure.in:
	* unix/tcl.m4:
	* unix/tkUnixInit.c:  moved all Darwin framework and TkAqua build
	support from macosx/Wish.pbproj and macosx/Makefile into the standard
	unix configure/make buildsystem, the project and macosx/Makefile are
	no longer required to build Tk.framework and/or TkAqua. TkAqua is now
	enabled by the --enable-aqua configure option, and static and
	non-framework builds of TkAqua are now available via the standard
	configure switches. Tk/X11 can also be built as a framework. The
	macosx/Makefile now wraps the unix buildsystem and no longer uses the
	projects, embedded builds are still only available via this Makefile,
	but for other builds it is not longer required (but its current
	functionality is still available for backwards compatibility). The
	projects currently do not call through to the Makefile to build
	(unlike Tcl.pbproj) so project builds may differ from makefile builds.
	Due to issues with spaces in pathnames, 'Wish Shell.app' has been
	renamed to 'Wish.app', the macosx/Makefile installs backwards
	compatibility symlinks for the old name.
	* macosx/tkMacOSXInit.c (TkpInit): added support for Tk resource file
	in non-framework and static builds: the resource file is copied into a
	__tk_rsrc MachO segment of the library or executable at link time and
	extracted into a temporary location at initialization.
	* unix/configure: autoconf-2.59
	* unix/tkConfig.h.in (new file): autoheader-2.59
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.102 2005/04/26 00:46:53 das Exp $
d166 1
a166 1
# lines. or call configure with --enable-symbols=mem
d210 3
a212 4
# The symbols below provide support for dynamic loading and shared
# libraries.  The values of the symbols are normally set by the
# configure script.  You shouldn't normally need to modify any of
# these definitions by hand.
d251 5
a255 3
# The symbol below provides support for dynamic loading and shared
# libraries.  See configure.in for a description of what it means.
# The values of the symbolis normally set by the configure script.
d323 1
a323 1
${KEYSYM_FLAGS}  @@EXTRA_CC_SWITCHES@@
@


1.102
log
@	* macosx/tkMacOSXNotify.c: sync with tclUnixNotfy.c changes since
	2004-06-22, added compile time check for threaded tcl core, removed
	unthreaded code paths as they are never used anyway, fixed
	TkMacOSXAlertNotifier() implementation.

	* unix/Makefile.in: added TCL_STUB_LIB_FILE, needed for unexporting of
	symbols from libtclstub to avoid duplicate symbol warnings.

	* unix/tcl.m4 (Darwin): added configure checks for recently added linker
	flags -single_module and -search_paths_first to allow building with
	older tools (and on Mac OS X 10.1), use -single_module in SHLIB_LD and
	not just T{CL,K}_SHLIB_LD_EXTRAS, added unexporting from Tk of symbols
	from libtclstub to avoid duplicate symbol warnings, added PLAT_SRCS
	definition for Mac OS X, defined MODULE_SCOPE to __private_extern__.
	(SC_MISSING_POSIX_HEADERS): added caching of dirent.h check.

	* unix/configure: autoconf-2.59
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.101 2005/02/11 18:31:56 hobbs Exp $
d13 1
a13 1
VERSION			= @@TK_VERSION@@
d30 2
a31 1
# to the "configure" script.
d45 1
a45 1
INSTALL_ROOT		=
d50 1
a50 1
TK_LIBRARY		= $(prefix)/lib/tk$(VERSION)
d61 1
a61 1
# Path name to use when installing library scripts:
d67 3
d71 1
a71 1
PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
d73 1
a73 1
# Top-level directory for manual entries:
d87 6
d112 3
d116 1
a116 1
PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)
d146 2
d250 1
a250 1
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@TCL_LIBS@@
d270 6
d289 2
a290 2
SRC_DIR			= @@srcdir@@/..
TOP_DIR			= @@srcdir@@/..
d292 1
a292 1
UNIX_DIR		= @@srcdir@@
d295 2
d312 1
a312 1
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${X11_INCLUDES} \
d314 1
a314 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}
d320 1
a320 1
-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${X11_INCLUDES} \
d322 1
a322 1
${KEYSYM_FLAGS}
d328 1
a328 1
WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \
d332 1
a332 1
CANVOBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvImg.o \
d336 1
a336 1
IMAGEOBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPPM.o tkImgPhoto.o
d338 1
a338 1
TEXTOBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \
d343 7
a349 1
FONTOBJS = @@UNIX_FONT_OBJS@@
d351 5
a355 1
UNIXOBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \
d357 1
a357 1
	tkUnixFocus.o tkUnixInit.o tkUnixKey.o tkUnixMenu.o \
d359 1
a359 1
	tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o tkStubLib.o
d361 11
a371 1
STUB_LIB_OBJS = tkStubLib.o tkStubImg.o
d373 2
a374 6
OBJS =  tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkClipboard.o tkCmds.o \
	tkColor.o tkConfig.o tkConsole.o tkCursor.o tkError.o tkEvent.o \
	tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o tkGrid.o \
	tkMain.o tkObj.o tkOldConfig.o tkOption.o tkPack.o tkPlace.o \
	tkSelect.o tkStyle.o tkUndo.o tkUtil.o tkVisual.o tkWindow.o  \
	$(UNIXOBJS) $(FONTOBJS) $(WIDGOBJS) $(CANVOBJS) $(IMAGEOBJS) $(TEXTOBJS)
d380 1
a380 1
SRCS = \
d418 3
a420 1
	$(GENERIC_DIR)/tkStubInit.c $(GENERIC_DIR)/tkStubLib.c \
d438 37
d488 1
a488 1
$(SRC_DIR)/doc/man.macros:
d490 1
a490 1
	$(INSTALL_DATA) @@TCL_SRC_DIR@@/doc/man.macros $(SRC_DIR)/doc/man.macros
d492 1
a492 1
doc: $(SRC_DIR)/doc/man.macros
d496 1
a496 1
${LIB_FILE}: ${OBJS}
d504 11
a519 1

d525 1
a525 1
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
d540 1
a540 2
	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
		@@TK_BUILD_LIB_SPEC@@ \
d560 1
a560 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
d569 1
a569 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
d582 1
a582 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
d591 1
a591 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
d599 1
a599 1
	@@echo "set env @@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}" > gdb.run
d605 3
a607 1
install: all install-binaries install-libraries install-demos install-doc
d610 1
a610 1
	$(MAKE) install \
d628 2
a629 2
	@@if test ! -x $(UNIX_DIR)/install-sh; then \
	    chmod +x $(UNIX_DIR)/install-sh; \
d637 3
a639 2
	    echo "package ifneeded Tk $(VERSION)\
		[list load [file join \$$dir .. $(TK_LIB_FILE)] Tk]";\
d645 5
a653 5
	@@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
	fi
d658 1
d660 4
a663 2
install-libraries:
	@@for i in $(INCLUDE_INSTALL_DIR) \
d674 2
a675 2
	@@if test ! -x $(UNIX_DIR)/install-sh; then \
	    chmod +x $(UNIX_DIR)/install-sh; \
d679 1
a679 1
		$(GENERIC_DIR)/tkPlatDecls.h ; \
d683 4
d688 2
a689 2
	@@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
	        $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
d694 1
a694 1
	@@for i in $(SRC_DIR)/library/images/*; \
d701 1
a701 1
	@@for i in $(SRC_DIR)/library/msgs/*.msg; \
d721 1
a721 1
	@@for i in $(SRC_DIR)/library/demos/*; \
d733 1
a733 1
	@@for i in $(SRC_DIR)/library/demos/images/*; \
d769 1
a769 1
install-private-headers:
d779 2
a780 2
	@@if test ! -x $(UNIX_DIR)/install-sh; then \
	    chmod +x $(UNIX_DIR)/install-sh; \
d785 1
a785 1
		$(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h ; \
d789 3
d795 2
d799 2
a800 2
	rm -f *.a *.o libtk* core errs *~ \#* TAGS *.E a.out errors \
		tktest wish config.info lib.exp
d803 2
a804 2
	rm -f Makefile config.status config.cache config.log tkConfig.sh \
		$(PACKAGE).* prototype
d1118 107
a1224 2
.c.o:
	$(CC) -c $(CC_SWITCHES) $<
d1226 2
a1227 3
#
# Target to check for proper usage of UCHAR macro.
#
d1229 2
a1230 2
checkuchar:
	-egrep isalnum\|isalpha\|iscntrl\|isdigit\|islower\|isprint\|ispunct\|isspace\|isupper\|isxdigit\|toupper\|tolower $(SRCS) | grep -v UCHAR
d1232 2
a1233 4
#
# Target to make sure that only symbols with "Tk" prefixes are
# exported.
#
d1235 2
a1236 2
checkexports: $(TK_LIB_FILE)
	-nm -p $(TK_LIB_FILE) | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Tt]k'
d1238 2
d1242 1
a1242 1
# Regenerate the stubs files.
d1272 14
d1309 8
a1316 6
DISTNAME =	tk${VERSION}${PATCH_LEVEL}
ZIPNAME =	tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
DISTDIR =	$(DISTROOT)/$(DISTNAME)
TCLDIR = 	@@TCL_SRC_DIR@@
$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in
	autoconf $(UNIX_DIR)/configure.in > $(UNIX_DIR)/configure
d1320 1
a1320 2
	mkdir -p $(DISTDIR)
	mkdir $(DISTDIR)/unix
d1371 1
a1371 1
		$(TOP_DIR)/macosx/*.c $(TOP_DIR)/macosx/*.h \
d1443 2
a1444 2
# (e.g. tcl8.0p1.tar.gz) but the extracted source directory doesn't
# include the patch designation (e.g. tcl8.0).
d1457 27
@


1.101
log
@	* unix/Makefile.in: remove SHLIB_LD_FLAGS (only for AIX, inlined
	* unix/tcl.m4:      into SHLIB_LD).  Combine AIX-* and AIX-5
	* unix/configure:   branches in SC_CONFIG_CFLAGS.
	Correct gcc builds for AIX-4+ and HP-UX-11.  autoconf-2.59 gen'd.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.100 2005/01/10 18:57:39 jenglish Exp $
d226 1
@


1.100
log
@Remove ${DBGX}, ${TK_DBGX} from Tk build system [Patch 1081595].
Re-synced with tcl/unix/tcl.m4.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.99 2004/12/07 00:35:03 hobbs Exp $
a241 1
SHLIB_LD_FLAGS		= @@SHLIB_LD_FLAGS@@
@


1.99
log
@add older ChangeLogs to dist target
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.98 2004/11/18 13:22:47 rmax Exp $
a98 3
# Libraries built with optimization switches have this additional extension
TK_DBGX			= @@TK_DBGX@@

d103 1
a103 1
PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX)
@


1.98
log
@generated configure and fixed manpage installaton
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.97 2004/11/18 00:43:19 rmax Exp $
d1124 2
a1125 1
	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog $(TOP_DIR)/README \
@


1.97
log
@2004-11-18  Reinhard Max  <max@@suse.de>
        * unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of
        * unix/configure.in:                patch #996085, that introduces
        * unix/Makefile.in:                 --enable-man-suffix.

        * unix/installManPage:              added
        * unix/mkLinks:                     removed
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.96 2004/08/19 17:59:18 dgp Exp $
d660 1
a660 1
	@@cd $(TOP_DIR)/doc; for i in *.1; do \
d665 1
a665 1
	@@cd $(TOP_DIR)/doc; for i in *.3; do \
d670 1
a670 1
	@@cd $(TOP_DIR)/doc; for i in *.n; do \
@


1.96
log
@        * tests/safe.test (safe-1.3):  Made test less sensitve to the
        full set of existing aliases in an interp, so the it only tests
        whether the tested ones are present.

        * unix/Makefile.in:     Copied LD_LIBRARY_PATH machinery from
        `make shell` target to other similar targets so that just built
        libraries are tested, rather than previous installations.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.95 2004/07/20 10:23:51 das Exp $
d284 3
a286 3
# Flags to be passed to mkLinks to control whether the manpages
# should be compressed and linked with softlinks
MKLINKS_FLAGS           = @@MKLINKS_FLAGS@@
d647 2
a648 2
	@@if test ! -x $(UNIX_DIR)/mkLinks; then \
	    chmod +x $(UNIX_DIR)/mkLinks; \
d659 14
a672 30
	@@echo "Installing top-level (.1) docs";
	@@cd $(SRC_DIR)/doc; for i in *.1; \
	    do \
	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
	    done;
	@@echo "Cross-linking top-level (.1) docs";
	@@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
	@@echo "Installing C API (.3) docs";
	@@cd $(SRC_DIR)/doc; for i in *.3; \
	    do \
	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
	    done;
	@@echo "Cross-linking top-level (.3) docs";
	@@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
	@@echo "Installing command (.n) docs";
	@@cd $(SRC_DIR)/doc; for i in *.n; \
	    do \
	    rm -f $(MANN_INSTALL_DIR)/$$i; \
	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
		    $$i > $(MANN_INSTALL_DIR)/$$i; \
	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
	    done;
	@@echo "Cross-linking command (.n) docs";
	@@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
a1084 5
mklinks:
	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl \
		$(UNIX_DIR)/../doc/*.[13n] > $(UNIX_DIR)/mkLinks
	chmod +x $(UNIX_DIR)/mkLinks

d1099 1
a1099 1
dist:   $(UNIX_DIR)/configure mklinks
d1109 1
a1109 1
		$(UNIX_DIR)/README $(UNIX_DIR)/mkLinks $(DISTDIR)/unix
@


1.95
log
@	* unix/Makefile.in:
	* win/Makefile.in: added 'install-private-headers' makefile target
	to allow optionally installing private tk headers. [Tcl FR 922727]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.94 2004/07/16 23:40:29 hobbs Exp $
d476 2
d485 2
d498 2
@


1.94
log
@	* unix/Makefile.in, unix/tcl.m4:     move (C|LD)FLAGS after their
	* unix/configure.in, unix/configure: _DEFAULT to allow for env
	setting to override m4 switches.
	Consolidate header checks to limit redundancy in configure.
	(CFLAGS_WARNING): Remove -Wconversion
	(SC_ENABLE_THREADS): Set m4 to force threaded build when built
	against a threaded Tcl core.
	Reorder configure.in for better 64-bit build configuration,
	replacing EXTRA_CFLAGS with CFLAGS.  [Bug #874058]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.93 2004/04/24 06:00:18 das Exp $
d66 3
d684 22
@


1.93
log
@	* generic/tkPort.h:
	* unix/Makefile.in:
	* win/Makefile.in: followup on tcl header reform [FR 922727]:
	removed use of relative #include paths in tkPort.h to allow
	installation of private headers outside of tk source tree; added
	tcl plaform source dir to compiler header search path.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.92 2004/03/17 18:15:50 das Exp $
d120 1
a120 1
CFLAGS			= @@CFLAGS@@ @@CFLAGS_DEFAULT@@
d125 1
a125 1
LDFLAGS			= @@LDFLAGS@@ @@LDFLAGS_DEFAULT@@
d265 1
a265 1
AC_FLAGS		= @@EXTRA_CFLAGS@@ @@DEFS@@
@


1.92
log
@Removed support for Mac OS Classic platform [Patch 918139]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.91 2004/03/04 00:07:06 hobbs Exp $
d85 4
d289 1
a289 1
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
d297 1
a297 1
-I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
@


1.91
log
@	* unix/Makefile.in (dist): don't require win/lamp.bmp copy in dist
	target (it's already handled by win/rc/*.bmp copy)
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.90 2003/11/11 00:07:37 hobbs Exp $
a1135 9
	mkdir $(DISTDIR)/mac
	cp -p $(TOP_DIR)/mac/tkMacProjects.sea.hqx $(DISTDIR)/mac
	cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \
		$(DISTDIR)/mac
	cp -p $(TOP_DIR)/mac/README $(DISTDIR)/mac
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/mac
	cp -p $(TOP_DIR)/mac/*.pch $(DISTDIR)/mac
	cp -p $(TOP_DIR)/mac/*.doc $(DISTDIR)/mac
	cp -p $(TOP_DIR)/mac/*.tcl $(DISTDIR)/mac
a1223 15
# Target to create a Macintosh version of the distribution.  This will
# do a normal distribution and then massage the output to prepare it
# for moving to the Mac platform.  This requires a few scripts and
# programs found only in the Tcl greoup's tool workspace.
#

macdist: dist
	rm -f $(DISTDIR)/mac/tkMacProjects.sea.hqx
	$(TCL_EXE) $(TOOL_DIR)/man2html.tcl $(DISTDIR)/tmp ../.. tk$(VERSION)
	mv $(DISTDIR)/tmp/tk$(VERSION) $(DISTDIR)/html
	rm -rf $(DISTDIR)/doc
	rm -rf $(DISTDIR)/tmp
	$(TCL_EXE) $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)

#
@


1.90
log
@        * unix/Makefile.in (SHLIB_LD_FLAGS): include in Makefile as it is
        used in MAKE_LIB sometimes (ie: AIX-64) [Bug #829686] (jimix)
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.89 2003/05/31 18:32:20 jenglish Exp $
a1127 1
	cp -p $(TOP_DIR)/win/lamp.bmp $(DISTDIR)/win
@


1.89
log
@Experimental support for antialiased text under X11 [Patch#535541]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.88 2003/04/04 19:29:38 mdejong Exp $
d238 1
@


1.88
log
@	* unix/Makefile.in: Subst TCL_LIBS instead of
	DL_LIBS and MATH_LIBS.
	* unix/configure: Regen.
	* unix/configure.in: Remove SC_ENABLE_THREADS
	invocation. Thread support in an extension
	should be automatic when Tcl is compiled
	with thread support. Add AC_DEFINE calls
	to set TCL_THREADS, _REENTRANT, and
	_THREAD_SAFE since this was done in
	SC_ENABLE_THREADS. Remove socket and math
	lib checks since these are already done in
	the Tcl configure script.
	* unix/tcl.m4: Update from Tcl to get
	TCL_LIBS fix. This fixes bug 597847
	which was caused by improper linking.
	* unix/tkConfig.sh.in: Subst TCL_LIBS
	instead of MATH_LIBS and DL_LIBS.
	[Bug 597847]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87 2002/11/19 02:20:35 hobbs Exp $
d132 1
a132 1
X11_LIB_SWITCHES	= @@XLIBSW@@
d250 4
d313 4
d319 1
a319 1
	tkUnixFocus.o tkUnixFont.o tkUnixInit.o tkUnixKey.o tkUnixMenu.o \
d330 1
a330 1
	$(UNIXOBJS) $(WIDGOBJS) $(CANVOBJS) $(IMAGEOBJS) $(TEXTOBJS)
d383 1
d963 4
@


1.87
log
@	* unix/Makefile.in: add macosx/*.tcl (buildTkConfig.tcl in
	particular) to the dist target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.86 2002/11/07 06:38:19 das Exp $
d229 2
a230 2
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
@


1.87.2.1
log
@	* unix/Makefile.in: do not run autoconf during 'make dist' as the
	configure is now a CVS-maintained file and should be up-to-date.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87 2002/11/19 02:20:35 hobbs Exp $
d1068 2
d1071 1
a1071 1
dist: mklinks
@


1.87.2.2
log
@        * unix/Makefile.in (SHLIB_LD_FLAGS): include in Makefile as it is
        used in MAKE_LIB sometimes (ie: AIX-64) [Bug #829686] (jimix)
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.1 2003/05/20 17:32:19 hobbs Exp $
a237 1
SHLIB_LD_FLAGS		= @@SHLIB_LD_FLAGS@@
@


1.87.2.3
log
@	* unix/Makefile.in, unix/tcl.m4:     move (C|LD)FLAGS after their
	* unix/configure.in, unix/configure: _DEFAULT to allow for env
	setting to override m4 switches.
	Consolidate header checks to limit redundancy in configure.
	(CFLAGS_WARNING): Remove -Wconversion, add -fno-strict-aliasing
	for gcc builds (need to suppress 3.x type puning warnings).
	(SC_ENABLE_THREADS): Set m4 to force threaded build when built
	against a threaded Tcl core.
	Reorder configure.in for better 64-bit build configuration,
	replacing EXTRA_CFLAGS with CFLAGS.  [Bug #874058]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.2 2003/11/11 00:05:36 hobbs Exp $
d116 1
a116 1
CFLAGS			= @@CFLAGS_DEFAULT@@ @@CFLAGS@@
d121 1
a121 1
LDFLAGS			= @@LDFLAGS_DEFAULT@@ @@LDFLAGS@@
d257 1
a257 1
AC_FLAGS		= @@DEFS@@
@


1.87.2.4
log
@        * tests/safe.test (safe-1.3):  Made test less sensitve to the
        full set of existing aliases in an interp, so the it only tests
        whether the tested ones are present.

        * unix/Makefile.in:     Copied LD_LIBRARY_PATH machinery from
        `make shell` target to other similar targets so that just built
        libraries are tested, rather than previous installations.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.3 2004/07/19 20:30:01 hobbs Exp $
a459 2
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
a466 2
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
a477 2
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:${@@LD_LIBRARY_PATH_VAR@@}; \
	export @@LD_LIBRARY_PATH_VAR@@; \
@


1.87.2.5
log
@2004-11-18  Reinhard Max  <max@@suse.de>

        * unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of
        * unix/configure.in:                patch #996085, that introduces
        * unix/Makefile.in:                 --enable-man-suffix.

        * unix/installManPage:              added
        * unix/mkLinks:                     removed
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.4 2004/10/26 23:23:14 dgp Exp $
d273 1
a273 1
# Flags to be passed to installManPage to control whether the manpages
d275 1
a275 1
MAN_FLAGS		= @@MAN_FLAGS@@
d631 2
a632 2
	@@if test ! -x $(UNIX_DIR)/installManPage; then \
	    chmod +x $(UNIX_DIR)/installManPage; \
d643 30
a672 14
	@@echo "Installing and cross-linking top-level (.1) docs";
	@@cd $(TOP_DIR)/doc; for i in *.1; do \
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
	done

	@@echo "Installing and cross-linking C API (.3) docs";
	@@cd $(TOP_DIR)/doc; for i in *.3; do \
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
	done

	@@echo "Installing and cross-linking command (.n) docs";
	@@cd $(TOP_DIR)/doc; for i in *.n; do \
	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
	done
d1059 5
d1076 1
a1076 1
dist:
d1086 1
a1086 1
		$(UNIX_DIR)/README $(UNIX_DIR)/installManPage $(DISTDIR)/unix
@


1.87.2.6
log
@Fixed manpage installation.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.5 2004/11/18 02:08:59 rmax Exp $
d644 1
a644 1
	@@for i in $(TOP_DIR)/doc/*.1; do \
d649 1
a649 1
	@@for i in $(SRC_DIR)/doc/*.3; do \
d654 1
a654 1
	@@for i in $(SRC_DIR)/doc/*.n; do \
@


1.87.2.7
log
@	* unix/Makefile.in: remove SHLIB_LD_FLAGS (only for AIX, inlined
	* unix/tcl.m4:      into SHLIB_LD).  Combine AIX-* and AIX-5
	* unix/configure:   branches in SC_CONFIG_CFLAGS.
	Correct gcc builds for AIX-4+ and HP-UX-11.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.6 2004/11/18 10:28:23 rmax Exp $
d238 1
@


1.87.2.8
log
@	* macosx/tkMacOSXNotify.c: syncd with tclUnixNotfy.c changes since
	2004-06-22, added compile time check for threaded tcl core, removed
	unthreaded code paths as they are never used anyway, fixed
	TkMacOSXAlertNotifier() implementation.

	* unix/Makefile.in: added TCL_STUB_LIB_FILE, needed for unexporting of
	symbols from libtclstub to avoid duplicate symbol warnings.

	* unix/tcl.m4 (Darwin): added configure checks for recently added linker
	flags -single_module and -search_paths_first to allow building with
	older tools (and on Mac OS X 10.1), use -single_module in SHLIB_LD and
	not just T{CL,K}_SHLIB_LD_EXTRAS, added unexporting from Tk of symbols
	from libtclstub to avoid duplicate symbol warnings, added PLAT_SRCS
	definition for Mac OS X.
	(SC_MISSING_POSIX_HEADERS): added caching of dirent.h check.
	(SC_TCL_64BIT_FLAGS): fixed 'checking for off64_t' message output.

	* unix/configure: autoconf-2.13
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.7 2005/02/10 23:42:01 hobbs Exp $
a221 1
TCL_STUB_LIB_FILE	= @@TCL_STUB_LIB_FILE@@
@


1.87.2.9
log
@	* macosx/Makefile:
	* macosx/README:
	* macosx/Tk-Info.plist.in (new file):
	* macosx/Wish-Info.plist.in (new file):
	* unix/Makefile.in:
	* unix/configure.in:
	* unix/tcl.m4:
	* unix/tkUnixInit.c:  moved all Darwin framework and TkAqua build
	support from macosx/Wish.pbproj and macosx/Makefile into the standard
	unix configure/make buildsystem, the project and macosx/Makefile are
	no longer required to build Tk.framework and/or TkAqua. TkAqua is now
	enabled by the --enable-aqua configure option, and static and
	non-framework builds of TkAqua are now available via the standard
	configure switches. Tk/X11 can also be built as a framework. The
	macosx/Makefile now wraps the unix buildsystem and no longer uses the
	projects, embedded builds are still only available via this Makefile,
	but for other builds it is not longer required (but its current
	functionality is still available for backwards compatibility). The
	projects currently do not call through to the Makefile to build
	(unlike Tcl.pbproj) so project builds may differ from makefile builds.
	Due to issues with spaces in pathnames, 'Wish Shell.app' has been
	renamed to 'Wish.app', the macosx/Makefile installs backwards
	compatibility symlinks for the old name.
	* macosx/tkMacOSXInit.c (TkpInit): added support for Tk resource file
	in non-framework and static builds: the resource file is copied into a
	__tk_rsrc MachO segment of the library or executable at link time and
	extracted into a temporary location at initialization.
	* unix/configure: autoconf-2.13
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.8 2005/04/26 00:49:50 das Exp $
d13 1
a13 1
VERSION 		= @@TK_VERSION@@
d30 1
a30 2
# to the "configure" script.  The *dir vars are standard configure
# substitutions that are based off prefix and exec_prefix.
d44 1
a44 1
INSTALL_ROOT		= $(DESTDIR)
d49 1
a49 1
TK_LIBRARY		= @@TK_LIBRARY@@
d60 1
a60 1
# Path name to use when installing library scripts.
d66 1
a66 7
# Path to the private tk header dir:
PRIVATE_INCLUDE_DIR	= @@PRIVATE_INCLUDE_DIR@@

# Directory in which to (optionally) install the private tk headers:
PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PRIVATE_INCLUDE_DIR)

# Top-level directory in which to install manual entries:
a79 6
# Path to the html documentation dir:
HTML_DIR		= @@HTML_DIR@@

# Directory in which to install html documentation:
HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)

a97 3
# Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
TK_PKG_DIR		= @@TK_PKG_DIR@@

d99 1
a99 1
PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/$(TK_PKG_DIR)
a128 2
AQUA_INCLUDES		= -I$(MAC_OSX_DIR) -I$(XLIB_DIR)

d147 1
a147 1
# lines or call configure with --enable-symbols=mem
d191 4
a194 3
# The symbol below provides support for dynamic loading and shared
# libraries.  See configure.in for a description of what it means.
# The value of the symbol is normally set by the configure script.
d231 1
a231 1
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ @@EXTRA_WISH_LIBS@@
d233 3
a235 5
# The symbols below provide support for dynamic loading and shared
# libraries.  See configure.in for a description of what the
# symbols mean.  The values of the symbols are normally set by the
# configure script.  You shouldn't normally need to modify any of
# these definitions by hand.
a250 6
# support for building the Aqua resource file
TK_RSRC_FILE		= @@TK_RSRC_FILE@@
WISH_RSRC_FILE		= @@WISH_RSRC_FILE@@
REZ			= @@REZ@@
REZ_SWITCHES = @@REZ_FLAGS@@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR)

d260 2
a261 2
SRC_DIR			= @@srcdir@@
TOP_DIR			= $(SRC_DIR)/..
d263 1
a263 1
UNIX_DIR		= $(SRC_DIR)
a265 2
MAC_OSX_DIR		= $(TOP_DIR)/macosx
XLIB_DIR		= $(TOP_DIR)/xlib
d275 1
a275 1
MAN_FLAGS               = @@MAN_FLAGS@@
d281 1
a281 1
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} \
d283 1
a283 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} @@EXTRA_CC_SWITCHES@@
d289 1
a289 1
-I${TCL_GENERIC_DIR} ${@@TK_WINDOWINGSYSTEM@@_INCLUDES} \
d291 1
a291 1
${KEYSYM_FLAGS} @@EXTRA_CC_SWITCHES@@
d297 1
a297 1
WIDG_OBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \
d301 1
a301 1
CANV_OBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvImg.o \
d305 1
a305 1
IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPPM.o tkImgPhoto.o
d307 1
a307 1
TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \
d310 1
a310 11
GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkClipboard.o \
	tkCmds.o tkColor.o tkConfig.o tkConsole.o tkCursor.o tkError.o \
	tkEvent.o tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o \
	tkGrid.o tkMain.o tkObj.o tkOldConfig.o tkOption.o tkPack.o tkPlace.o \
	tkSelect.o tkStyle.o tkUndo.o tkUtil.o tkVisual.o tkWindow.o

STUB_OBJS = tkStubInit.o tkStubLib.o

STUB_LIB_OBJS = tkStubLib.o tkStubImg.o

X11_OBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \
d314 1
a314 1
	tkUnixSend.o tkUnixWm.o tkUnixXId.o
d316 1
a316 11
AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
	tkMacOSXColor.o tkMacOSXConfig.o tkMacOSXCursor.o tkMacOSXDebug.o \
	tkMacOSXDialog.o tkMacOSXDraw.o tkMacOSXEmbed.o tkMacOSXEntry.o \
	tkMacOSXEvent.o tkMacOSXFont.o tkMacOSXHLEvents.o tkMacOSXInit.o \
	tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \
	tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \
	tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \
	tkMacOSXSubwindows.o tkMacOSXTest.o tkMacOSXWindowEvent.o \
	tkMacOSXWm.o tkMacOSXXStubs.o \
	tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \
	xcolors.o xdraw.o xgc.o ximage.o xutil.o
d318 6
a323 2
OBJS =  $(GENERIC_OBJS) $(WIDG_OBJS) $(CANV_OBJS) $(IMAGE_OBJS) $(TEXT_OBJS) \
	$(STUB_OBJS) $(@@TK_WINDOWINGSYSTEM@@_OBJS) @@PLAT_OBJS@@
d329 1
a329 1
GENERIC_SRCS = \
d367 1
a367 3
	$(GENERIC_DIR)/tkStubInit.c $(GENERIC_DIR)/tkStubLib.c

X11_SRCS = \
a383 36
AQUA_SRCS = \
	$(MAC_OSX_DIR)/tkMacOSXBitmap.c $(MAC_OSX_DIR)/tkMacOSXButton.c \
	$(MAC_OSX_DIR)/tkMacOSXClipboard.c $(MAC_OSX_DIR)/tkMacOSXColor.c \
	$(MAC_OSX_DIR)/tkMacOSXConfig.c $(MAC_OSX_DIR)/tkMacOSXCursor.c \
	$(MAC_OSX_DIR)/tkMacOSXDebug.c $(MAC_OSX_DIR)/tkMacOSXDialog.c \
	$(MAC_OSX_DIR)/tkMacOSXDraw.c $(MAC_OSX_DIR)/tkMacOSXEmbed.c \
	$(MAC_OSX_DIR)/tkMacOSXEntry.c $(MAC_OSX_DIR)/tkMacOSXEvent.c \
	$(MAC_OSX_DIR)/tkMacOSXFont.c $(MAC_OSX_DIR)/tkMacOSXHLEvents.c \
	$(MAC_OSX_DIR)/tkMacOSXInit.c $(MAC_OSX_DIR)/tkMacOSXKeyboard.c \
	$(MAC_OSX_DIR)/tkMacOSXKeyEvent.c $(MAC_OSX_DIR)/tkMacOSXMenu.c \
	$(MAC_OSX_DIR)/tkMacOSXMenubutton.c $(MAC_OSX_DIR)/tkMacOSXMenus.c \
	$(MAC_OSX_DIR)/tkMacOSXMouseEvent.c $(MAC_OSX_DIR)/tkMacOSXNotify.c \
	$(MAC_OSX_DIR)/tkMacOSXRegion.c $(MAC_OSX_DIR)/tkMacOSXScrlbr.c \
	$(MAC_OSX_DIR)/tkMacOSXSend.c $(MAC_OSX_DIR)/tkMacOSXSubwindows.c \
	$(MAC_OSX_DIR)/tkMacOSXTest.c $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c \
	$(MAC_OSX_DIR)/tkMacOSXWm.c $(MAC_OSX_DIR)/tkMacOSXXStubs.c \
	$(GENERIC_DIR)/tkFileFilter.c $(GENERIC_DIR)/tkMacWinMenu.c \
	$(GENERIC_DIR)/tkPointer.c $(UNIX_DIR)/tkUnix3d.c \
	$(UNIX_DIR)/tkUnixScale.c $(XLIB_DIR)/xcolors.c $(XLIB_DIR)/xdraw.c \
	$(XLIB_DIR)/xgc.c $(XLIB_DIR)/ximage.c $(XLIB_DIR)/xutil.c

SRCS = $(GENERIC_SRCS) $(@@TK_WINDOWINGSYSTEM@@_SRCS) @@PLAT_SRCS@@

AQUA_RESOURCES = \
	$(MAC_OSX_DIR)/tkAboutDlg.r $(MAC_OSX_DIR)/tkMacOSXCursors.r \
	$(MAC_OSX_DIR)/tkMacOSXMenu.r $(MAC_OSX_DIR)/tkMacOSXXCursors.r

AQUA_WISH_RESOURCES = $(MAC_OSX_DIR)/tkMacOSXAETE.r

AQUA_HDRS = $(MAC_OSX_DIR)/tkMacOSX.h $(GENERIC_DIR)/tkIntXlibDecls.h

AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbytes.h

AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h

X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h
d397 1
a397 1
$(TOP_DIR)/doc/man.macros:
d399 1
a399 1
	$(INSTALL_DATA) @@TCL_SRC_DIR@@/doc/man.macros $(TOP_DIR)/doc/man.macros
d401 1
a401 1
doc: $(TOP_DIR)/doc/man.macros
d405 1
a405 1
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @@LIB_RSRC_FILE@@
a412 11
# Build Aqua resource files
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
	rm -f $@@
	if test "$(REZ)" != ""; then \
	    $(REZ) -o $@@ $(REZ_SWITCHES) $(AQUA_RESOURCES); fi

${WISH_RSRC_FILE}: $(AQUA_WISH_RESOURCES)
	rm -f $@@
	if test "$(REZ)" != ""; then \
	    $(REZ) -o $@@ $(REZ_SWITCHES) $(AQUA_WISH_RESOURCES); fi

d418 1
d424 1
a424 1
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @@APP_RSRC_FILE@@
d439 2
a440 1
	${CC} $(LDFLAGS) $(TKTEST_OBJS) @@TK_BUILD_LIB_SPEC@@ \
d460 1
a460 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
d469 1
a469 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
d482 1
a482 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
d491 1
a491 1
	@@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}; \
d499 1
a499 1
	@@echo "set env @@LD_LIBRARY_PATH_VAR@@=`pwd`:${TCL_BIN_DIR}:$${@@LD_LIBRARY_PATH_VAR@@}" > gdb.run
d505 1
a505 3
INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @@EXTRA_INSTALL@@

install: $(INSTALL_TARGETS)
d508 1
a508 1
	$(MAKE) $(INSTALL_TARGETS) \
d526 2
a527 2
	@@if test ! -x $(SRC_DIR)/install-sh; then \
	    chmod +x $(SRC_DIR)/install-sh; \
d535 2
a536 3
	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
d542 4
d550 1
a550 5
	    fi
	@@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
	@@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
	@@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
	@@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
a554 1
	@@EXTRA_INSTALL_BINARIES@@
d556 2
a557 4
install-libraries: libraries
	@@if test "$(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS)" != ""; then \
	    XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \
	for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \
d568 2
a569 2
	@@if test ! -x $(SRC_DIR)/install-sh; then \
	    chmod +x $(SRC_DIR)/install-sh; \
d573 1
a573 1
		$(GENERIC_DIR)/tkPlatDecls.h $(@@TK_WINDOWINGSYSTEM@@_HDRS) ; \
a576 4
	@@for i in $(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS) ; \
	    do \
	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
	    done;
d578 2
a579 2
	@@for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
	        $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
d584 1
a584 1
	@@for i in $(TOP_DIR)/library/images/*; \
d591 1
a591 1
	@@for i in $(TOP_DIR)/library/msgs/*.msg; \
d611 1
a611 1
	@@for i in $(TOP_DIR)/library/demos/*; \
d623 1
a623 1
	@@for i in $(TOP_DIR)/library/demos/images/*; \
d649 1
a649 1
	@@for i in $(TOP_DIR)/doc/*.3; do \
d654 1
a654 1
	@@for i in $(TOP_DIR)/doc/*.n; do \
a657 25
# Optional target to install private headers
install-private-headers: libraries
	@@for i in $(PRIVATE_INCLUDE_INSTALL_DIR); \
	    do \
	    if [ ! -d $$i ] ; then \
		echo "Making directory $$i"; \
		mkdir -p $$i; \
		chmod 755 $$i; \
		else true; \
		fi; \
	    done;
	@@if test ! -x $(SRC_DIR)/install-sh; then \
	    chmod +x $(SRC_DIR)/install-sh; \
	    fi
	@@echo "Installing private header files";
	@@for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
		$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
		$(@@TK_WINDOWINGSYSTEM@@_PRIVATE_HDRS); \
	    do \
	    $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
	    done;
	@@if test -f tkConfig.h; then\
	    $(INSTALL_DATA) tkConfig.h $(PRIVATE_INCLUDE_INSTALL_DIR); \
	    fi;

d662 2
a663 2
	rm -f *.a *.o libtk* core errs *~ \#* TAGS *.E a.out \
		errors wish tktest lib.exp Tk *.rsrc
d666 2
a667 2
	rm -rf Makefile config.status config.cache config.log tkConfig.sh \
		$(PACKAGE).* prototype *.plist Tk.framework
d977 2
a978 2
tkMacOSXBitmap.o: $(MAC_OSX_DIR)/tkMacOSXBitmap.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXBitmap.c
d980 3
a982 2
tkMacOSXButton.o: $(MAC_OSX_DIR)/tkMacOSXButton.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXButton.c
d984 2
a985 2
tkMacOSXClipboard.o: $(MAC_OSX_DIR)/tkMacOSXClipboard.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXClipboard.c
d987 4
a990 2
tkMacOSXColor.o: $(MAC_OSX_DIR)/tkMacOSXColor.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXColor.c
d992 2
a993 68
tkMacOSXConfig.o: $(MAC_OSX_DIR)/tkMacOSXConfig.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXConfig.c

tkMacOSXCursor.o: $(MAC_OSX_DIR)/tkMacOSXCursor.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXCursor.c

tkMacOSXDebug.o: $(MAC_OSX_DIR)/tkMacOSXDebug.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXDebug.c

tkMacOSXDialog.o: $(MAC_OSX_DIR)/tkMacOSXDialog.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXDialog.c

tkMacOSXDraw.o: $(MAC_OSX_DIR)/tkMacOSXDraw.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXDraw.c

tkMacOSXEmbed.o: $(MAC_OSX_DIR)/tkMacOSXEmbed.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEmbed.c

tkMacOSXEntry.o: $(MAC_OSX_DIR)/tkMacOSXEntry.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEntry.c

tkMacOSXEvent.o: $(MAC_OSX_DIR)/tkMacOSXEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEvent.c

tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXFont.c

tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c

tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXInit.c

tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXKeyboard.c

tkMacOSXKeyEvent.o: $(MAC_OSX_DIR)/tkMacOSXKeyEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXKeyEvent.c

tkMacOSXMenu.o: $(MAC_OSX_DIR)/tkMacOSXMenu.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMenu.c

tkMacOSXMenubutton.o: $(MAC_OSX_DIR)/tkMacOSXMenubutton.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMenubutton.c

tkMacOSXMenus.o: $(MAC_OSX_DIR)/tkMacOSXMenus.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMenus.c

tkMacOSXMouseEvent.o: $(MAC_OSX_DIR)/tkMacOSXMouseEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXMouseEvent.c

tkMacOSXNotify.o: $(MAC_OSX_DIR)/tkMacOSXNotify.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXNotify.c

tkMacOSXRegion.o: $(MAC_OSX_DIR)/tkMacOSXRegion.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXRegion.c

tkMacOSXScrlbr.o: $(MAC_OSX_DIR)/tkMacOSXScrlbr.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXScrlbr.c

tkMacOSXSend.o: $(MAC_OSX_DIR)/tkMacOSXSend.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSend.c

tkMacOSXSubwindows.o: $(MAC_OSX_DIR)/tkMacOSXSubwindows.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSubwindows.c

tkMacOSXTest.o: $(MAC_OSX_DIR)/tkMacOSXTest.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXTest.c
a994 35
tkMacOSXWindowEvent.o: $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c

tkMacOSXWm.o: $(MAC_OSX_DIR)/tkMacOSXWm.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXWm.c

tkMacOSXXStubs.o: $(MAC_OSX_DIR)/tkMacOSXXStubs.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXXStubs.c

tkFileFilter.o: $(GENERIC_DIR)/tkFileFilter.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFileFilter.c

tkMacWinMenu.o: $(GENERIC_DIR)/tkMacWinMenu.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkMacWinMenu.c

tkPointer.o: $(GENERIC_DIR)/tkPointer.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPointer.c

xcolors.o: $(XLIB_DIR)/xcolors.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xcolors.c

xdraw.o: $(XLIB_DIR)/xdraw.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xdraw.c

xgc.o: $(XLIB_DIR)/xgc.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xgc.c

ximage.o: $(XLIB_DIR)/ximage.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/ximage.c

xutil.o: $(XLIB_DIR)/xutil.c
	$(CC) -c $(CC_SWITCHES) $(XLIB_DIR)/xutil.c

.c.o:
	$(CC) -c $(CC_SWITCHES) $<
d997 1
a997 1
# Target to regenerate header files and stub files from the *.decls tables.
a1026 14
#
# Target to check for proper usage of UCHAR macro.
#

checkuchar:
	-egrep isalnum\|isalpha\|iscntrl\|isdigit\|islower\|isprint\|ispunct\|isspace\|isupper\|isxdigit\|toupper\|tolower $(SRCS) | grep -v UCHAR

#
# Target to make sure that only symbols with "Tk" prefixes are
# exported.
#

checkexports: $(TK_LIB_FILE)
	-nm -p $(TK_LIB_FILE) | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Tt]k'
d1050 4
a1053 4
DISTNAME = tk${VERSION}${PATCH_LEVEL}
ZIPNAME	 = tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
DISTDIR	 = $(DISTROOT)/$(DISTNAME)
TCLDIR   = @@TCL_SRC_DIR@@
d1057 2
a1058 1
	mkdir -p $(DISTDIR)/unix
d1118 1
a1118 1
		$(TOP_DIR)/macosx/*.c $(TOP_DIR)/macosx/*.h $(TOP_DIR)/macosx/*.in \
d1190 2
a1191 2
# (e.g. tk8.0p1.tar.gz) but the extracted source directory doesn't
# include the patch designation (e.g. tk8.0).
a1203 27
# This target creates the HTML folder for Tcl & Tk and places it
# in DISTDIR/html.  It uses the tcltk-man2html.tcl tool from
# the Tcl group's tool workspace.  It depends on the Tcl & Tk being
# in directories called tcl8.3 & tk8.3 up two directories from the
# TOOL_DIR.
#

html:
	$(BUILD_HTML)
	@@EXTRA_BUILD_HTML@@
html-tcl:
	$(BUILD_HTML) --tcl
	@@EXTRA_BUILD_HTML@@
html-tk:
	$(BUILD_HTML) --tk
	@@EXTRA_BUILD_HTML@@

BUILD_HTML = \
	@@if test -f $(TCL_BIN_DIR)/tclsh; then \
	@@LD_LIBRARY_PATH_VAR@@=$(TCL_BIN_DIR):$${@@LD_LIBRARY_PATH_VAR@@}; export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TCLSH="$(TCL_BIN_DIR)/tclsh"; else \
	TCLSH="$(TCL_EXE)"; fi ;\
	$${TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
		--srcdir=$(TOP_DIR)/..

#
@


1.87.2.10
log
@	* unix/Makefile.in (install-libraries): protect possible empty
	list in for with list= trick for older shells.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.9 2005/05/24 04:21:32 das Exp $
d611 1
a611 1
		if [ ! -d $$i ] ; then \
d657 1
a657 1
		if [ ! -d $$i ] ; then \
d673 1
a673 1
	@@list='$(@@TK_WINDOWINGSYSTEM@@_XLIB_HDRS)'; for i in $$list ; \
@


1.87.2.11
log
@	* unix/Makefile.in (install-private-headers): rewrite tkPort.h when
	installing private headers to remove ../unix relative #include path to
	tkUnixPort.h (which is incorrect at the installed location).
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.10 2005/05/25 17:46:40 hobbs Exp $
d774 1
a774 1
		$(GENERIC_DIR)/tkIntPlatDecls.h \
d779 3
a781 3
	@@sed -e 's#\.\./unix/##' $(GENERIC_DIR)/tkPort.h > tkPort.h; \
	    $(INSTALL_DATA) tkPort.h $(PRIVATE_INCLUDE_INSTALL_DIR); \
	    rm -f tkPort.h
@


1.87.2.12
log
@	* unix/Makefile.in: Subst TCLSH_PROG and
	BUILD_TCLSH into Makefile. Rework html
	target so that it depends on the tclsh
	installed on the system PATH.
	* unix/configure: Regen.
	* unix/configure.in: Invoke SC_PROG_TCLSH
	and SC_BUILD_TCLSH and subst into Makefile.
	* unix/tcl.m4: Update from Tcl.
	* win/Makefile.in: Subst TCLSH_PROG and
	BUILD_TCLSH into Makefile. Rework winhelp
	target so that it depends on the tclsh
	installed on the system PATH.
	* win/configure: Regen.
	* win/configure.in: Invoke SC_BUILD_TCLSH
	and subst into Makefile.
	* win/tcl.m4: Update from Tcl.
	[Tcl patch 1244153]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.11 2005/06/23 06:00:29 das Exp $
a188 15
# BUILD_TCLSH is the fully qualified path name of the tclsh shell
# in the Tcl build directory. Test that need to be run in the
# version of tclsh that we are building against should use this
# path. Targets that need an installed tclsh should not depend
# on this variable.

BUILD_TCLSH		= @@BUILD_TCLSH@@

# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
# running make for the first time. Certain build targets (make genstubs)
# need it to be available on the PATH. This executable should *NOT* be
# required just to do a normal build although it can be required to run
# make dist. This variable is set to "" if no tclsh is available.
TCL_EXE			= @@TCLSH_PROG@@

d202 7
d1458 7
a1464 4
	@@if test -f "$(TCL_EXE)"; then \
	$(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
		--srcdir=$(TOP_DIR)/.. ; \
	fi
@


1.87.2.13
log
@	* unix/Makefile.in (html): reverted/amended changes of 2005-07-24
	that broke TkAqua 'make install'; added BUILD_HTML_FLAGS
	optional var like in tcl/unix/Makefile.in.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.12 2005/07/25 01:33:51 mdejong Exp $
d1466 4
a1469 7
	@@if test -f "$(BUILD_TCLSH)"; then \
	@@LD_LIBRARY_PATH_VAR@@=$(TCL_BIN_DIR):$${@@LD_LIBRARY_PATH_VAR@@}; export @@LD_LIBRARY_PATH_VAR@@; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TCLSH="$(BUILD_TCLSH)"; else \
	TCLSH="$(TCL_EXE)"; fi ;\
	$${TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
		--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
@


1.87.2.14
log
@	* macosx/tkMacOSXCarbonEvents.c (new): moved carbon events code into
	* macosx/tkMacOSXHLEvents.c:           new file like on HEAD,
	* macosx/tkMacOSXInit.c (TkpInit):     initialize carbon event handlers
	* macosx/tkMacOSXInt.h:                in TkpInit(), add new source
	* unix/Makefile.in:                    file to Makefile.in.

	* macosx/tkMacOSXCarbonEvents.c (AppEventHandlerProc): handle carbon
	events sent directly to application event target via the general
	TkMacOSXProcessEvent() in the same way as events posted to the event
	loop. Moved existing app event handlers to tkMacOSXWindowEvent.c.
	(TkMacOSXInitCarbonEvents): register our application event handler for
	kEventWindowExpanded events to deal with uncollapsing from the dock.

	* macosx/tkMacOSXEvent.h: made TkMacOSXProcessEvent() non-static, added
	* macosx/tkMacOSXEvent.c: new interp field to TkMacOSXEvent struct for
	                          use by app event handler.

	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): retrieve
	current window, partCode, modifiers and local cursor position from
	carbon mouse event if possible. Use new static GenerateButtonEvent()
	taking a MouseEventData struct instead of TkGenerateButtonEvent() to
	avoid recomputing already known values. Move process activation on
	MouseDown into BringWindowForward() to allow clicking on window titlebar
	widgets without activating process. Move code dealing with clicks in
	window titelbar into separate function HandleWindowTitlebarMouseDown()
	to avoid code duplication. Avoid repeated calls to TkMacOSXGetXWindow()
	by storing result in MouseEventData struct.
	(TkMacOSXButtonKeyState, XQueryPointer): try to get button and modifier
	state from currently processed carbon event (to avoid unnecessary IPC
	with the window server), otherwise use modern carbon API to get this
	info instead of Button() and GetKeys(); only retrieve info caller asks
	for (via non-NULL ptr passed to XQueryPointer).
	(ButtonModifiers2State): new static function converting carbon button
	and modifier state into tk state, allows detection of more than 3 mouse
	buttons (tk supports up to 5) and of NumLock and Fn modifier keys
	(NumLock is mapped to Mod3 and Fn to Mod4).

	* macosx/tkMacOSXWindowEvent.c (TkMacOSXProcessApplicationEvent): handle
	kEventWindowExpanded event to deal with window uncollapsing from the
	dock by generating tk Map event, handle kEventAppHidden and
	kEventAppShown events (moved here from tkMacOSXCarbonEvents.c).

	* macosx/tkMacOSXSubwindows.c (XUnmapWindow): only hide window when
	it is not iconified to avoid window flashing on collapse.

	* macosx/tkMacOSXWm.c: replaced Tk_DoWhenIdle() by Tcl_DoWhenIdle().
	(TkMacOSXZoomToplevel): remove call to TrackBox(), now done in
	HandleWindowTitlebarMouseDown() in tkMacOSXMouseEvent.c.
	(TkpWmSetState): avoid window flashing on collapse by unmapping after
	calling CollapseWindow(); only uncollapse window if it is collapsed.

	* generic/tkInt.decls: changed TkMacOSXZoomToplevel() signature.
	* generic/tkIntPlatDecls.h:

	* macosx/tkMacOSXKeyEvent.c (TkMacOSXProcessKeyboardEvent): only call
	GetMenuItemCommandID() on KeyDown or KeyRepeat events.

	* macosx/tkMacOSXMenu.c (ReconfigureMacintoshMenu): remove call to
	obsolete AppendResMenu() API.

	* macosx/tkMacOSXKeyEvent.c: replaced all direct uses of expensive
	* macosx/tkMacOSXMenu.c:     GetMouse() and TkMacOSXButtonKeyState()
	* macosx/tkMacOSXMenus.c:    APIs by calls to XQueryPointer()
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDialog.c:   replaced use of FrontNonFloatingWindow()
	* macosx/tkMacOSXKeyEvent.c: by ActiveNonFloatingWindow() as
	* macosx/tkMacOSXMenu.c:     recommended by Carbon docs.
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDialog.c: fixed warnings
	* macosx/tkMacOSXTest.c:

	* macosx/tkMacOSXCarbonEvents.c: added CVS Id line to file header.
	* macosx/tkMacOSXDebug.c:
	* macosx/tkMacOSXDebug.h:
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXEvent.h:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.h:

	* macosx/tkMacOSXEmbed.c: replaced all uses of panic() with Tcl_Panic()
	* macosx/tkMacOSXFont.c:  (sync with HEAD).
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXInt.h:      sync with HEAD changes of 2005-03-14.
	* macosx/tkMacOSXSubwindows.c:

	* macosx/tclets.r (removed): sync with HEAD.
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXPort.h:

	* library/demos/menu.tcl: removed errant '}'.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.13 2005/07/30 06:45:40 das Exp $
d369 1
a369 1
	tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXCarbonEvents.o \
a452 1
	$(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c \
a1115 3
tkMacOSXCarbonEvents.o: $(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c
	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c

@


1.87.2.15
log
@	* unix/tcl.m4 (Darwin): add 64bit support, check for Tiger copyfile(),
	add CFLAGS to SHLIB_LD to support passing -isysroot in env(CFLAGS) to
	configure (flag can't be present twice, so can't be in both CFLAGS and
	LDFLAGS during configure), don't use -prebind when deploying on 10.4,
	define TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING (rdar://3171542).
	(SC_ENABLE_LANGINFO, SC_TIME_HANDLER): add/fix caching, fix obsolete
	autoconf macros. Sync with tk/unix/tcl.m4, sync whitespace with HEAD.

	* unix/configure.in: fix obsolete autoconf macros, sync gratuitous
	formatting/ordering differences with tcl/unix/configure.in.

	* unix/Makefile.in: add CFLAGS to wish/tktest link to make executable
	linking the same as during configure (needed to avoid loosing any linker
	relevant flags in CFLAGS, in particular flags that can't be in LDFLAGS).
	Avoid concurrent linking of wish and compiling of tkTestInit.o during
	parallel make, fix dependencies and flags for building tkMacOSXInit.o
	(checkstubs, checkexports): dependency and Darwin fixes

	* macosx/tkMacOSXEvent.c (TkMacOSXProcessEvent):
	* macosx/tkMacOSXEvent.h:
	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent):
	* macosx/tkMacOSXCarbonEvents.c: install standard application event
	handler, add & call functions to start and stop carbon even timer that
	runs the tcl event loop periodically during a nested carbon event loop
	in the toolbox (e.g. during menutracking) to ensure tcl timers etc
	continue to fire, register app event handler for menu tracking and HI
	command carbon events, move menu event handling to new handlers for
	those carbon events, no longer register for/handle appleevent carbon
	event (now dealt with by standard application event handler), event
	debugging code dynamically acquires carbon event debugging functions to
	allow use on Tiger where they are no longer exported from HIToolbox.

	* macosx/tkMacOSXFont.c (TkMacOSXUseAntialiasedText):
	* macosx/tkMacOSXKeyEvent.c (GetKeyboardLayout):
	* macosx/tkMacOSXCarbonEvents.c (TkMacOSXInitCarbonEvents):
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXInt.h: abstract common code to dynamically acquire
	address of a named symbol (from a loaded dynamic library) into new
	function TkMacOSXGetNamedSymbol() and macro TkMacOSXInitNamedSymbol.

	* macosx/tkMacOSXMenu.c (TkpNewMenu):
	* macosx/tkMacOSXMenubutton.c (MenuButtonInitControl):
	* macosx/tkMacOSXMenus.c (TkMacOSXHandleMenuSelect): switch to  modern
	utf8 aware menu manager API, remove obsolete code, add error handling.

	* macosx/tkMacOSXMouseEvent.c: define OSX 10.3 or later only constants
	if necessary to allow compilation on OSX 10.2

	* macosx/tkMacOSXWm.c (UpdateSizeHints): remove code that is never
	executed.

	* generic/tk.h: add/correct location of version numbers in macosx files.

	* generic/tkInt.h: clarify fat compile comment.

	* macosx/Wish.pbproj/default.pbxuser (new file):
	* macosx/Wish.pbproj/jingham.pbxuser:
	* macosx/Wish.pbproj/project.pbxproj: sync with HEAD.

	* macosx/buildTkConfig.tcl (removed): remove obsolete build files.

	* macosx/README: clarification/cleanup, sync with HEAD, document
	universal (fat) builds via CFLAGS (i.e. ppc and i386 at the same time).

	* macosx/Makefile: add support for reusing configure cache, build target
	fixes.

	* generic/tkMenu.c:
	* macosx/tkMacOSXButton.c:
	* macosx/tkMacOSXDebug.c:
	* macosx/tkMacOSXDebug.h:
	* macosx/tkMacOSXDialog.c:
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXXStubs.c:
	* macosx/tkMacOSXSubwindows.c:
	* xlib/xgc.c: declare functions and globals used only in own file as
	static, #ifdef out a few Xlib and aqua functions that are never called
	(sync with HEAD).

	* macosx/tkMacOSXPort.h:
	* generic/tkInt.decls: correct signature of TkMacOSXHandleMenuSelect,
	add XSync to aqua Xlib stubs.

	* generic/tkTest.c: #ifdef unix only declarations.
	(TestmetricsCmd): unify win and mac implementation.

	* generic/tkTextDisp.c:
	* generic/tkTextBTree.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXXStubs.c: fix gcc 4 warnings.

	* macosx/tkMacOSXNotify.c:
	* macosx/tkMacOSXTest.c: sync with HEAD.

	* generic/tkIntPlatDecls.h:
	* generic/tkIntXlibDecls.h:
	* generic/tkStubInit.c:
	* unix/configure: regen.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.14 2005/08/09 07:40:03 das Exp $
d525 2
a526 1
	${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @@TK_BUILD_LIB_SPEC@@ \
d539 1
a539 1
	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @@TK_BUILD_LIB_SPEC@@ \
d547 1
a547 1
	${CC} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \
a808 4
# To enable concurrent parallel make of wish and tktest, this target has to
# depend on wish, this ensures that linking of wish with tkTestInit.o does not
# execute concurrently with the renaming and recompiling of that same object
# file in the target below.
d810 1
a810 1
tkTestInit.o: $(UNIX_DIR)/tkAppInit.c wish
d1156 2
a1157 3
tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh
	$(CC) -c $(CC_SWITCHES)  -DTK_LIBRARY=\"${TK_LIBRARY}\" \
	    $(MAC_OSX_DIR)/tkMacOSXInit.c
d1250 2
a1251 3
checkstubs: $(TK_LIB_FILE)
	-@@for i in `nm -p $(TK_LIB_FILE) \
		| awk '$$2 ~ /^[TDBCS]$$/ { sub("^_", "", $$3); print $$3 }' \
d1255 1
a1255 1
		    if [ `grep -c "$$i *(" $$j` -gt 0 ]; then \
d1275 1
a1275 3
	-@@nm -p $(TK_LIB_FILE) \
	| awk '$$2 ~ /^[TDBCS]$$/ { sub("^_", "", $$3); print $$3 }' \
	| sort -n | grep -E -v '^([Tt]k|_?X)' || true
d1365 3
a1367 4
	cp -p $(TOP_DIR)/macosx/Makefile $(TOP_DIR)/macosx/README \
		$(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.c \
		$(TOP_DIR)/macosx/*.h $(TOP_DIR)/macosx/*.in \
		$(TOP_DIR)/macosx/*.r $(DISTDIR)/macosx
d1369 3
a1371 1
	cp -p $(TOP_DIR)/macosx/Wish.pbproj/*.pbx* $(DISTDIR)/macosx/Wish.pbproj
@


1.87.2.16
log
@update `make dist` for the wish.exe.manifest -> wish.exe.manifest.in change
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.15 2005/11/27 02:44:26 das Exp $
d1356 1
a1356 1
	cp -p $(TOP_DIR)/win/rc/wish.exe.manifest.in $(DISTDIR)/win/rc/
d1361 1
a1361 1
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest.in
@


1.87.2.17
log
@another try
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.16 2005/12/01 19:03:14 dgp Exp $
d1356 1
a1356 1
	cp -p $(TOP_DIR)/win/wish.exe.manifest.in $(DISTDIR)/win/
d1361 1
a1361 1
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/wish.exe.manifest.in
@


1.87.2.18
log
@
	* generic/tkConsole.c: TIP #268 update regarding registered package
	* generic/tkMain.c:    version, now using full patchlevel instead of
	* generic/tkWindow.c:  major.minor
	* library/tk.tcl:
	* unix/configure:
	* unix/Makefile.in:
	* unix/tcl.m4:
	* win/configure:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rules.vc:
	* win/tcl.m4:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.17 2005/12/01 19:12:44 dgp Exp $
a12 1
TCLPATCHL		= @@TCL_PATCH_LEVEL@@
d634 1
a634 1
		$(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\
d636 1
a636 1
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(TCLPATCHL)\
@


1.87.2.19
log
@
	* generic/tkConsole.c: Complete reversal of the changes of Sep 22.
	* generic/tkMain.c:    For compat reason the Tcl core will not change
	* generic/tkWindow.c:  the registered version to include the patchlevel,
	* library/tk.tcl:      making the changes to Tk unnecessary.
	* unix/configure:
	* unix/Makefile.in:
	* unix/tcl.m4:
	* win/configure:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rules.vc:
	* win/tcl.m4:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.18 2006/09/22 19:01:51 andreas_kupries Exp $
d634 2
d637 1
a637 2
	    echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
@


1.87.2.20
log
@	* unix/Makefile.in (dist): copy license.terms to dist macosx dir.
	* unix/configure.in: install license.terms into Tk.framework; fix tk
	debug build detection.
	* unix/configure: autoconf-2.13
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.19 2006/09/25 17:28:20 andreas_kupries Exp $
d464 1
a464 1
	$(MAC_OSX_DIR)/tkMacOSXXCursors.r
d1372 4
a1375 5
	cp -p $(MAC_OSX_DIR)/Makefile $(MAC_OSX_DIR)/README \
		$(MAC_OSX_DIR)/Wish.icns $(MAC_OSX_DIR)/*.c \
		$(MAC_OSX_DIR)/*.h $(MAC_OSX_DIR)/*.in \
		$(MAC_OSX_DIR)/*.r $(DISTDIR)/macosx
	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
d1377 1
a1377 1
	cp -p $(MAC_OSX_DIR)/Wish.pbproj/*.pbx* $(DISTDIR)/macosx/Wish.pbproj
d1383 1
a1383 1
	cp -p $(XLIB_DIR)/*.h $(XLIB_DIR)/*.c $(DISTDIR)/xlib
d1386 1
a1386 1
	cp -p $(XLIB_DIR)/X11/*.h $(DISTDIR)/xlib/X11
@


1.87.2.21
log
@	* unix/Makefile.in:	add support for compile flags specific to
				object files linked directly into executables.

	* unix/configure.in (Darwin): only use -seg1addr flag when prebinding;
	use -mdynamic-no-pic flag for object files linked directly into exes.

	* unix/configure: autoconf-2.13
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.87.2.20 2007/04/29 02:25:36 das Exp $
d316 4
a319 3
-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
${@@TK_WINDOWINGSYSTEM@@_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} \
${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} @@EXTRA_CC_SWITCHES@@
d321 1
a321 3
CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} 

APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @@EXTRA_APP_CC_SWITCHES@@
d818 1
a818 1
	$(CC) -c $(APP_CC_SWITCHES) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
d826 1
a826 1
	$(CC) -c $(APP_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
d955 1
a955 1
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkSquare.c
d1009 1
a1009 1
	$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkTest.c
@


1.86
log
@	* unix/Makefile.in: added macosx/README to dist target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id$
d1065 1
a1065 1
ZIPNAME =	tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}.zip
d1135 1
a1135 1
		$(TOP_DIR)/macosx/*.r $(DISTDIR)/macosx
@


1.85
log
@	* unix/README: doc'ed --enable-symbols options.
	* unix/Makefile.in: comment docs
	* unix/configure: regen
	* unix/tcl.m4: replaced SC_ENABLE_MEMDEBUG with a more intelligent
	SC_ENABLE_SYMBOLS that takes yes|no|mem|all as options now.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.84 2002/09/27 00:47:26 hobbs Exp $
d1139 1
@


1.84
log
@	* unix/Makefile.in: add macosx subdir to dist target.
	Do not generate .Z, only .gz and .zip in alldist target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.83 2002/09/26 17:07:33 das Exp $
d147 4
a150 3
# lines.  Warning:  if you enable memory debugging, you must do it
# *everywhere*, including all the code that calls Tcl, and you must use
# ckalloc and ckfree everywhere instead of malloc and free.
@


1.83
log
@	* macosx/Makefile: preserve environment value of INSTALL_ROOT.
	When embedding only use deployment build. Force relink before
	embedded build to ensure new linker flags are picked up.

	* macosx/buildTkConfig.tcl (new):
	* macosx/Wish.pbproj/project.pbxproj: synthesize tkConfig.sh
	based on tclConfig.sh in Tcl.framework and tkConfig.sh.in.
	Add symbolic links to debug lib, stub libs and tkConfig.sh
	in framework toplevel. Made tkIntXlibDecls.h a public header
	since Headers/X11/Xlib.h includes it. Install wish8.4 script
	that runs "Wish Shell.app" and corresponding wish link.
	Use tcl headers from built Tcl.framework instead of from tcl
	source directory.

        * macosx/tkMacOSXPort.h: added missing standard unix includes
        and defines, similarly to tkUnixPort.h.
        * macosx/tkMacOSXNotify.c: removed dependency on internal tcl
        header "tclPort.h"

	* unix/Makefile.in:
	* unix/install-sh: copied support for 'install-strip' target
	over from tcl/unix/{Makefile.in,install-sh}
@
text
@d8 1
a8 1
# RCS: @@(#) $Id$
d1131 7
d1196 3
a1198 6
	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
		$(DISTROOT)/$(DISTNAME).tar.gz \
		$(DISTROOT)/$(ZIPNAME)
	cd $(DISTROOT); tar cf $(DISTNAME).tar $(DISTNAME); \
		gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \
		compress $(DISTNAME).tar; zip -qr8 $(ZIPNAME) $(DISTNAME)
d1209 1
a1209 3
	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
		$(DISTROOT)/$(DISTNAME).tar.gz \
		$(DISTROOT)/$(ZIPNAME)
d1212 2
a1213 3
	cd $(DISTROOT); tar cf $(DISTNAME).tar tk${VERSION}; \
		gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \
		compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) tk${VERSION}
@


1.82
log
@	* unix/Makefile.in: added DYLIB_INSTALL_DIR variable for Darwin
	and set it to default value ${LIB_RUNTIME_DIR}
	* unix/tcl.m4 (Darwin): use DYLIB_INSTALL_DIR instead of
	LIB_RUNTIME_DIR in the -install_name argument to ld.
	* unix/configure: regen.

	* macosx/Wish.pbproj/project.pbxproj:
	* macosx/Makefile: added support for building Tcl as an embedded
	framework, i.e. using an dyld install_name containing
	@@executable_path/../Frameworks via the new DYLIB_INSTALL_DIR
	unix/Makefile variable.
@
text
@d175 3
d498 5
@


1.81
log
@	* unix/tcl.m4: update from Tcl

	* unix/Makefile.in: import of TK_SHLIB_LD_EXTRAS for Tk library
	specific linker settings. Added use of new LD_LIBRARY_PATH_VAR.

	* unix/configure: regen
@
text
@d243 3
@


1.80
log
@	* unix/Makefile.in (install-binaries): simplified pkgIndex.tcl
	file created on installation.
	* win/Makefile.in (install-binaries): corrected and simplified
	creation of pkgIndex.tcl file on installation.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.79 2002/08/08 11:43:08 rmax Exp $
d235 1
d477 2
a478 5
	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
	export LD_LIBRARY_PATH; \
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
d485 1
a485 3
	@@echo "set env LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}" > gdb.run
	@@echo "set env LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}" >> gdb.run
	@@echo "set env SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}" >> gdb.run
@


1.79
log
@	* unix/Makefile.in: Fixed typos in DISTNAME, and ZIPNAME.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.78 2002/07/28 03:23:08 mdejong Exp $
d514 1
a514 1
	@@if test "$(TK_SHARED_BUILD)"; then \
d517 6
a522 6
	    echo "if {[package vcompare \\" > $(PKG_INDEX); \
	    echo "    [package provide Tcl] \\" >> $(PKG_INDEX); \
	    echo "    $(TCLVERSION)] != 0} {return}" >> $(PKG_INDEX); \
	    echo "package ifneeded Tk $(VERSION) \\" >> $(PKG_INDEX); \
	    echo "    [list load [file join \$$dir .. \\" >> $(PKG_INDEX); \
	    echo "    $(TK_LIB_FILE)] Tk]" >> $(PKG_INDEX); \
@


1.78
log
@	* unix/Makefile.in: Add MAJOR_VERSION, MINOR_VERSION,
	PATCH_LEVEL, INSTALL_LIBRARY, STUB_LIB_FILE, and LIB_FILE
	to support changes in tcl.m4 related to library builds.
	Use MAKE_LIB macro to avoid dealing with RANLIB issues.
	Rename TK_CC_SEARCH_FLAGS to CC_SEARCH_FLAGS and
	rename TK_LD_SEARCH_FLAGS to LD_SEARCH_FLAGS.
	Use new INSTALL_LIB and INSTALL_STUB_LIB substs to
	deal with ranlib issues when install libraries.
	* unix/configure: Regen.
	* unix/configure.in: Remove AC_PROG_RANLIB since
	this is done by tcl.m4 now. Define CC_SEARCH_FLAGS
	instead of TK_CC_SEARCH_FLAGS and so on.
	Use MAKE_LIB and MAKE_STUB_LIB from tcl.m4.
	Remove AC_SUBST calls that are no done in tcl.m4.
	* unix/tcl.m4: Update from Tcl.
	* unix/tkConfig.sh.in: Subst CC_SEARCH_FLAGS and
	LD_SEARCH_FLAGS.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.77 2002/07/16 23:17:09 mdejong Exp $
d1056 2
a1057 2
DISTNAME =	tk${TK_VERSION}${TK_PATCH_LEVEL}
ZIPNAME =	tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip
@


1.77
log
@	* unix/Makefile.in:
	* win/Makefile.in: Add a more descriptive warning
	in the event `make genstubs` needs to be rerun.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.76 2002/07/14 05:48:46 dgp Exp $
d14 3
d177 1
d200 3
d209 3
d239 2
a240 2
TK_CC_SEARCH_FLAGS	= @@TK_CC_SEARCH_FLAGS@@
TK_LD_SEARCH_FLAGS	= @@TK_LD_SEARCH_FLAGS@@
d384 1
a384 1
binaries: ${TK_LIB_FILE} ${STUB_LIB_FILE} wish
d396 2
a397 2
${TK_LIB_FILE}: ${OBJS}
	rm -f ${TK_LIB_FILE}
a398 1
	$(RANLIB) ${TK_LIB_FILE}
d401 1
a401 1
	rm -f ${STUB_LIB_FILE}
a402 1
	$(RANLIB) ${STUB_LIB_FILE}
d418 1
a418 1
		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
d432 1
a432 1
		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest
d435 1
a435 1
# It should use TK_CC_SEARCH_FLAGS, it does not include the shared
d441 1
a441 1
		$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
a513 2
	@@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
	@@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
d524 3
a526 2
	@@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
	@@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
d535 5
a539 6
	    fi
	@@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(TK_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
			 $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
	    fi
d1056 2
a1057 2
DISTNAME =	tk@@TK_VERSION@@@@TK_PATCH_LEVEL@@
ZIPNAME =	tk@@TK_MAJOR_VERSION@@@@TK_MINOR_VERSION@@@@TK_PATCH_LEVEL@@.zip
@


1.76
log
@	* Completed conversion of Tk test suite to use tcltest.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.75 2002/07/12 13:41:01 dgp Exp $
d997 3
a999 1
	@@echo "Warning: run \"make genstubs\" to regenerate tkStubInit.c"
@


1.75
log
@	* Converted several files in the Tk test suite for testing by
	tcltest 2.1.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.74 2002/07/08 22:08:49 davygrvy Exp $
d445 1
a445 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 -match \* \
d455 1
a455 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 -match \* \
@


1.74
log
@Added missing win/lamp.bmp to the dist target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.73 2002/06/26 02:38:26 dgp Exp $
d445 1
a445 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
d455 1
a455 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
@


1.73
log
@	* Expanded install-binaries target to create and install a
	pkgIndex.tcl file to enable Tk as a loadable package [Patch 521356]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.72 2002/06/25 16:45:12 rmax Exp $
d1098 1
@


1.72
log
@	* unix/tcl.m4:       New macro SC_CONFIG_MANPAGES.
	* unix/configure.in: Added support for symlinks and compression
	* unix/Makefile.in:  when installing the manpages. [Patch 518052]
	                     Default is still hardlinks and no compression.

	* unix/mkLinks:      generated
	* unix/configure:

	* unix/README:       Added documentation for the new features.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.71 2002/06/21 23:09:53 hobbs Exp $
d92 9
d494 1
a494 1
	@@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
d508 10
@


1.71
log
@	* doc/text.n:          TIP #104 implementation which generalizes the
	* generic/tkText.c:    undo/redo stack to not be tied solely to the
	* generic/tkText.h:    text widget.  The APIs are still private.
	* generic/tkUndo.c:    This also adds a stack limiting ability and
	* generic/tkUndo.h:    a -maxundo option to the text widget (in
	* library/text.tcl:    addition to the options from TIP #26) should
	* mac/tkMacDefault.h:  users want to limit the undo/redo stack
	* tests/text.test:     (should not be necessary in most cases).
	* unix/Makefile.in:    [Patch #554763] (callewart)
	* unix/tkUnixDefault.h:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/tkWinDefault.h:
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.70 2002/06/21 20:24:29 dgp Exp $
d245 4
a496 3
	@@if test ! -x $(UNIX_DIR)/mkLinks; then \
	    chmod +x $(UNIX_DIR)/mkLinks; \
	    fi
d591 3
d612 1
a612 1
	@@$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
d622 1
a622 1
	@@$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
d632 1
a632 1
	@@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
d1017 5
d1036 1
a1036 1
dist:   $(UNIX_DIR)/configure
d1046 1
a1046 1
		$(UNIX_DIR)/README $(DISTDIR)/unix
a1048 3
	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl $(TOP_DIR)/doc/*.[13n] \
		> $(DISTDIR)/unix/mkLinks
	chmod +x $(DISTDIR)/unix/mkLinks
@


1.70
log
@	* Removed unnecessary dependence of tktest executable on the tcltest
	executable on Unix.  If there are similar dependencies on other
	platforms, they can probably be removed as well.  [Bug 572134].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.69 2002/06/18 23:51:46 dkf Exp $
d290 1
a290 1
	tkSelect.o tkStyle.o tkUtil.o tkVisual.o tkWindow.o  \
d311 2
a312 2
	$(GENERIC_DIR)/tkUtil.c $(GENERIC_DIR)/tkVisual.c \
	$(GENERIC_DIR)/tkWindow.c \
d881 3
@


1.69
log
@Added TIP#48 style engine implementation
Frederic Bonnet to supply docs+tests as soon as possible.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.68 2002/06/17 20:17:55 hobbs Exp $
d263 1
a263 3
TCLTEST_OBJS = ${TCL_BIN_DIR}/tclTest.o ${TCL_BIN_DIR}/tclThreadTest.o \
        ${TCL_BIN_DIR}/tclUnixTest.o
TKTEST_OBJS = $(TCLTEST_OBJS) tkTestInit.o tkTest.o tkSquare.o
a398 6
# This rule is executed if the user tried to run tktest without first
# building tcltest in the Tcl bin directory. Just do it for them.
${TCL_BIN_DIR}/tcltest:
	cd ${TCL_BIN_DIR} ; \
	$(MAKE) tcltest

d405 1
a405 1
tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
@


1.68
log
@	* unix/Makefile.in (dist): correct installation of
	wish.exe.manifest to DISTDIR target directory.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.67 2002/06/14 23:10:42 jenglish Exp $
d292 1
a292 1
	tkSelect.o tkUtil.o tkVisual.o tkWindow.o  \
d312 3
a314 2
	$(GENERIC_DIR)/tkSelect.c $(GENERIC_DIR)/tkUtil.c \
	$(GENERIC_DIR)/tkVisual.c $(GENERIC_DIR)/tkWindow.c \
d319 1
a319 2
	$(GENERIC_DIR)/tkMessage.c \
	$(GENERIC_DIR)/tkPanedWindow.c \
d751 3
@


1.67
log
@Reverting to r1.65 -- last change should not have been committed.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.65 2002/03/06 18:54:16 davygrvy Exp $
d1077 1
a1077 1
	cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(TOP_DIR)/win/rc/
@


1.66
log
@TIP #47 "Modifying Tk to Allow Writing X Window managers"
(patch from Neil McKay).
* Add CirculateRequest, Create, MapRequest, ResizeRequest,
  and ConfigureRequest event types;
* Split TK_TOPLEVEL flag into TK_TOPLEVEL, TK_HAS_WRAPPER,
  TK_WIN_MANAGED, and TK_TOP_HIERARCHY.
@
text
@a140 6
# To disable window-manager enablers, reverse the comment characters
# on the following two lines.

WM_ENABLER_FLAGS	= -DWM_ENABLERS
#WM_ENABLER_FLAGS	= 

d251 1
a251 2
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} \
${WM_ENABLER_FLAGS}
d259 1
a259 1
${WM_ENABLER_FLAGS} ${KEYSYM_FLAGS}
@


1.65
log
@Added win/rc/wish.exe.manifest to the dist target. Noted missing by
Ryan Casey.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.64 2002/03/05 19:44:43 davygrvy Exp $
d141 6
d257 2
a258 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}
d266 1
a266 1
${KEYSYM_FLAGS}
@


1.64
log
@Added win/rules.vc and included the use of eolFix to make sure they
have the correct <EOL> for the dist target.  eolFix is in tcl's tools/ dir,
and $(TOOL_DIR) correctly refers there.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.63 2002/02/22 02:41:17 hobbs Exp $
d1077 1
d1081 2
@


1.63
log
@TIP #41 implementation, panedwindow [Patch #512503] (melski)
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.62 2002/01/29 08:04:37 mdejong Exp $
d1069 1
d1071 3
@


1.62
log
@	* unix/Makefile.in: Remove commented out vars.
	* unix/configure: Regen.
	* unix/configure.in: Don't subst vars that are already
	taken care of in SC_LOAD_TCLCONFIG.
	* unix/tcl.m4: Update from Tcl.
	* win/configure: Regen.
	* win/tcl.m4: Update from Tcl.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.61 2002/01/11 19:58:51 mdejong Exp $
d268 2
a269 2
	tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o tkScale.o \
	tkScrollbar.o
d319 1
d784 3
@


1.61
log
@	* unix/Makefile.in: Burn Tcl and Tk build
	directories into tktest executable to avoid crashes
	caused by ld loading a previously installed version
	of the tcl or tk shared libraries. Remove setting
	of LD_LIBRARY_PATH, LIBPATH, and SHLIB_PATH
	before running tktest since it should no
	longer be required.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.60 2002/01/11 18:41:04 mdejong Exp $
a195 1
#TCL_LIB_SPEC		= @@TCL_BUILD_LIB_SPEC@@
a196 1
#TCL_STUB_LIB_SPEC	= @@TCL_BUILD_STUB_LIB_SPEC@@
@


1.60
log
@	Enable use of Tcl stubs when building Tk as
	a shared library. This should fix the build
	under AIX. [Bugs 220858, 220955, 220921]

	* unix/Makefile.in: Add TCL_STUB_LIB_SPEC and
	TCL_STUB_LIB_FLAG variables.
	* unix/configure: Regen.
	* unix/configure.in: Pass TCL_STUB_LIB_SPEC into
	Makefile and use it when linking the tk shared library.
	Define USE_TCL_STUBS when building shared. Subst
	TCL_STUB_LIB_SPEC and TCL_STUB_LIB_FLAG.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.59 2001/12/19 07:45:52 mdejong Exp $
d408 6
d415 3
d422 4
a438 5
	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
	export LD_LIBRARY_PATH; \
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
a445 5
	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
	export LD_LIBRARY_PATH; \
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
a456 4
	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
	export LD_LIBRARY_PATH; \
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; export SHLIB_PATH; \
@


1.59
log
@	* unix/Makefile.in:
	* win/Makefile.in: Use $(MAKE) instead of make
	in the tcltest rule.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.58 2001/11/25 06:43:44 mdejong Exp $
d198 3
@


1.58
log
@	* unix/Makefile.in: Add comments to better describe
	TCL_EXE and when it should be available. Add
	rule that prints message about running `make genstubs`
	when tkStubInit.c is out of date.
	* win/Makefile.in: Add TCL_TOOL_DIR and TCL_EXE
	variables to better match the Tcl Makefile. Add
	genstubs rule so tkSTubInit.c can be regenerated.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.57 2001/11/23 02:04:21 das Exp $
d403 1
a403 1
	make tcltest
@


1.57
log
@	**  upport to 8.4 of mac code changes for 8.3.3 & various new
	**  changes for 8.4, some already backported to 8.3.4 (patch #435660)

	see ChangeLog for details
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.56 2001/11/11 03:21:24 mdejong Exp $
d167 5
a171 5
# The following specifies which Tcl executable to use for make targets
# below.  This can generally be 'tclsh', meaning all targets will work
# once we have created the initial executable, but in some cases you
# may want to use a target without having made tclsh on these sources
# (like for make genstubs)
d965 3
a967 1
# Target to regenerate header files and stub files from the *.decls tables.
d969 4
@


1.56
log
@	* unix/Makefile.in:
	* win/Makefile.in: Add "make gdb" target. This target
	can run wish inside either gdb or insight.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.55 2001/11/09 07:14:23 mdejong Exp $
a1073 1
	cp -p $(TOP_DIR)/mac/*.exp $(DISTDIR)/mac
@


1.55
log
@	* unix/Makefile.in:
	Avoid adding libc to the LIBS and WISH_LIBS
	variables since it is not needed when linking with CC.
	If required when linking with LD it should be done
	on a case by case basis in tcl.m4.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.54 2001/08/07 20:17:13 hobbs Exp $
d470 10
@


1.54
log
@	* unix/Makefile.in (dist): added {unix,win}/tcl.m4 and
	library/msgs/*.msg to dist target.  [Bug: #448802]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.53 2001/07/11 01:36:41 mdejong Exp $
d205 2
a206 2
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
@


1.54.2.1
log
@Merge with current TOT
Added support for the wm stackorder command
Fixed crash when selecting Menu items in the Application menu that we didn't
put there.
Added first bits of the use of CG for low-level drawing.  The line-drawing works,
the rest doesn't yet.  You have to set the file static useCGDrawing to 1 and
rebuild to activate this code.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.54 2001/08/07 20:17:13 hobbs Exp $
d167 5
a171 5
# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
# running make for the first time. Certain build targets (make genstubs)
# need it to be available on the PATH. This executable should *NOT* be
# required just to do a normal build although it can be required to run
# make dist.
d196 1
a197 2
TCL_STUB_LIB_SPEC	= @@TCL_STUB_LIB_SPEC@@
TCL_STUB_LIB_FLAG	= @@TCL_STUB_LIB_FLAG@@
d205 2
a206 2
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
d403 1
a403 7
	$(MAKE) tcltest

# Resetting the LIB_RUNTIME_DIR below is required so that
# the generated tktest executable gets the build directory
# burned into its ld search path. This keeps tktest from
# picking up an already installed version of the Tcl or
# Tk shared libraries.
a405 3
	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)

tktest-real:
a409 4
# FIXME: This xttest rule seems to be broken in a number of ways.
# It should use TK_CC_SEARCH_FLAGS, it does not include the shared
# lib location logic from tktest, and it is not clear where this
# test.o object file comes from.
d423 5
d435 5
d451 4
a470 10
# This target can be used to run wish inside either gdb or insight
gdb: wish
	@@echo "set env LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}" > gdb.run
	@@echo "set env LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}" >> gdb.run
	@@echo "set env SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}" >> gdb.run
	@@echo "set env TCL_LIBRARY=@@TCL_SRC_DIR@@/library" >> gdb.run
	@@echo "set env TK_LIBRARY=@@TK_SRC_DIR@@/library" >> gdb.run
	gdb ./wish --command=gdb.run
	rm gdb.run

d955 1
a955 1

a956 6
# Regenerate the stubs files.
#

$(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \
		$(GENERIC_DIR)/tkInt.decls
	@@echo "Warning: run \"make genstubs\" to regenerate tkStubInit.c"
d1064 1
@


1.54.2.2
log
@Merging with TOT as of 06/09/2002.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id$
d268 2
a269 2
	tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \
	tkPanedWindow.o tkScale.o tkScrollbar.o
a318 1
	$(GENERIC_DIR)/tkPanedWindow.c \
a783 3
tkPanedWindow.o: $(GENERIC_DIR)/tkPanedWindow.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPanedWindow.c

a1064 1
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/*.bat
a1065 3
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/makefile.*
	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rules.vc
a1068 1
	cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(TOP_DIR)/win/rc/
a1071 2
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest
@


1.54.2.3
log
@merged with trunk at tag macosx-8-4-merge-2002-08-20-trunk
@
text
@a13 3
MAJOR_VERSION		= @@TK_MAJOR_VERSION@@
MINOR_VERSION		= @@TK_MINOR_VERSION@@
PATCH_LEVEL		= @@TK_PATCH_LEVEL@@
a91 9
# Flag, 1: we're building a shared lib, 0 we're not
TK_SHARED_BUILD		= @@TK_SHARED_BUILD@@

# Directory in which to install the pkgIndex.tcl file for loadable Tk
PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX)

# Package index file for loadable Tk
PKG_INDEX		= $(PKG_INSTALL_DIR)/pkgIndex.tcl

a164 1
INSTALL_LIBRARY		= ${INSTALL}
a186 3
# Generic stub lib name used in rules that apply to tcl and tk
STUB_LIB_FILE		= ${TK_STUB_LIB_FILE}

a192 3
# Generic lib name used in rules that apply to tcl and tk
LIB_FILE		= ${TK_LIB_FILE}

d220 2
a221 2
CC_SEARCH_FLAGS	= @@CC_SEARCH_FLAGS@@
LD_SEARCH_FLAGS	= @@LD_SEARCH_FLAGS@@
a244 4
# Flags to be passed to mkLinks to control whether the manpages
# should be compressed and linked with softlinks
MKLINKS_FLAGS           = @@MKLINKS_FLAGS@@

d263 3
a265 1
TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o
d292 1
a292 1
	tkSelect.o tkStyle.o tkUndo.o tkUtil.o tkVisual.o tkWindow.o  \
d312 1
a312 2
	$(GENERIC_DIR)/tkSelect.c $(GENERIC_DIR)/tkStyle.c \
	$(GENERIC_DIR)/tkUndo.c $(GENERIC_DIR)/tkUtil.c \
d318 2
a319 1
	$(GENERIC_DIR)/tkMessage.c $(GENERIC_DIR)/tkPanedWindow.c \
d363 1
a363 1
binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
d375 2
a376 2
${LIB_FILE}: ${OBJS}
	rm -f $@@
d378 1
d381 1
a381 1
	rm -f $@@
d383 1
d399 7
a405 1
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
d413 1
a413 1
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
d419 1
a419 1
		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
d422 1
a422 1
# It should use CC_SEARCH_FLAGS, it does not include the shared
d428 1
a428 1
		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
d489 1
a489 1
	@@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
d501 2
a502 9
	@@if test "x$(TK_SHARED_BUILD)" = "x1"; then \
	    echo "Creating package index $(PKG_INDEX)"; \
	    rm -f $(PKG_INDEX); \
	    (\
	    echo "if {[package vcompare [package provide Tcl]\
		$(TCLVERSION)] != 0} { return }";\
	    echo "package ifneeded Tk $(VERSION)\
		[list load [file join \$$dir .. $(TK_LIB_FILE)] Tk]";\
	    ) > $(PKG_INDEX); \
d504 4
a507 3
	@@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
	@@@@INSTALL_LIB@@
	@@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
d516 6
a521 5
	fi
	@@if test "$(STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
	    @@INSTALL_STUB_LIB@@ ; \
	fi
a597 3
	@@if test ! -x $(UNIX_DIR)/mkLinks; then \
	    chmod +x $(UNIX_DIR)/mkLinks; \
	    fi
d616 1
a616 1
	@@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR)
d626 1
a626 1
	@@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
d636 1
a636 1
	@@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
a751 3
tkStyle.o: $(GENERIC_DIR)/tkStyle.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStyle.c

a886 3
tkUndo.o: $(GENERIC_DIR)/tkUndo.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkUndo.c

d976 1
a976 3
	@@echo "Warning: tkStubInit.c may be out of date."
	@@echo "Developers may want to run \"make genstubs\" to regenerate."
	@@echo "This warning can be safely ignored, do not report as a bug!"
a1014 5
mklinks:
	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl \
		$(UNIX_DIR)/../doc/*.[13n] > $(UNIX_DIR)/mkLinks
	chmod +x $(UNIX_DIR)/mkLinks

d1022 2
a1023 2
DISTNAME =	tk${VERSION}${PATCH_LEVEL}
ZIPNAME =	tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}.zip
d1029 1
a1029 1
dist:   $(UNIX_DIR)/configure mklinks
d1039 1
a1039 1
		$(UNIX_DIR)/README $(UNIX_DIR)/mkLinks $(DISTDIR)/unix
d1042 3
a1074 1
	cp -p $(TOP_DIR)/win/lamp.bmp $(DISTDIR)/win
d1077 1
a1077 1
	cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(DISTDIR)/win/rc/
@


1.53
log
@	* unix/Makefile.in: Add AR and STLIB_LD variables.
	* unix/configure:
	* unix/configure.in: Use STLIB_LD when defining MAKE_LIB
	and MAKE_STUB_LIB. Subst STLIB_LD, RANLIB, and AR.
	* unix/tcl.m4: Update from Tcl.
	* win/configure: Regen.
	* win/tcl.m4: Update from Tcl.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.52 2001/06/27 02:06:13 mdejong Exp $
d1016 2
a1017 2
	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in \
		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tk.spec \
d1045 1
a1045 1
		$(TOP_DIR)/win/aclocal.m4 \
d1082 6
@


1.52
log
@	* unix/Makefile.in:
	* win/Makefile.in: Add `make shell` target. This target
	will set the proper env vars before invoking wish
	from the build directory.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.51 2001/06/22 23:59:48 mdejong Exp $
d212 1
d229 1
@


1.51
log
@	* unix/Makefile.in: Set CFLAGS to @@CFLAGS@@ and @@CFLAGS_DEFAULT@@.
	Set LDFLAGS to @@LDFLAGS@@ and @@LDFLAGS_DEFAULT@@. Add LDFLAGS_DEBUG
	and LDFLAGS_OPTIMIZE to match the way CFLAGS_DEFAULT works. Use
	new LDFLAGS variable in the Makefile instead of @@LDFLAGS@@.
	* unix/configure: Regen.
	* unix/configure.in: Don't set CFLAGS to CFLAGS_DEFAULT, instead
	subst CFLAGS_DEFAULT into the Makefile. Add AC_SUBST for CFLAGS_DEBUG,
	CFLAGS_OPTIMIZE, LDFLAGS_DEFAULT, LDFLAGS_DEBUG, and LDFLAGS_OPTIMIZE.
	Remove unused LD_FLAGS subst.
	* unix/tcl.m4: Update from Tcl.
	* win/Makefile.in: Set CFLAGS to @@CFLAGS@@ and @@CFLAGS_DEFAULT@@.
	Set LDFLAGS to @@LDFLAGS@@ and @@LDFLAGS_DEFAULT@@.
	* win/configure: Regen.
	* win/configure.in: Don't set CFLAGS or LDFLAGS, instead subst
	CFLAGS_DEFAULT and LDFLAGS_DEFAULT into the Makefile.
	* win/tcl.m4: Update from Tcl.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.50 2001/04/25 20:52:48 mdejong Exp $
d456 12
@


1.50
log
@	* unix/Makefile.in: Use TCL_STUB_LIB_FILE instead of STUB_LIB_FILE.
	* unix/configure: Regen.
	* unix/configure.in: Don't subst STUB_LIB_FILE, use TCL_STUB_LIB_FILE
	instead.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.49 2000/09/29 21:40:54 hobbs Exp $
d104 6
a109 1
CFLAGS			= @@CFLAGS@@
d393 1
a393 1
	$(CC) @@LDFLAGS@@ $(WISH_OBJS) \
d404 1
a404 1
	${CC} @@LDFLAGS@@ $(TKTEST_OBJS) \
d409 1
a409 1
	${CC} @@LDFLAGS@@ test.o tkTest.o tkSquare.o \
@


1.49
log
@	* win/Makefile.in: commented use of TESTFLAGS
	* unix/Makefile.in: added TESTFLAGS to test and testlang targets to
	conform with Windows makefile and TEA style.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.48 2000/09/02 01:18:24 ericm Exp $
d177 1
a177 1
STUB_LIB_FILE		= @@STUB_LIB_FILE@@
@


1.49.2.1
log
@sync with head
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.65 2002/03/06 18:54:16 davygrvy Exp $
d104 1
a104 6
CFLAGS			= @@CFLAGS@@ @@CFLAGS_DEFAULT@@

# Flags to pass to the linker
LDFLAGS_DEBUG		= @@LDFLAGS_DEBUG@@
LDFLAGS_OPTIMIZE	= @@LDFLAGS_OPTIMIZE@@
LDFLAGS			= @@LDFLAGS@@ @@LDFLAGS_DEFAULT@@
d162 5
a166 5
# TCL_EXE is the name of a tclsh executable that is available *BEFORE*
# running make for the first time. Certain build targets (make genstubs)
# need it to be available on the PATH. This executable should *NOT* be
# required just to do a normal build although it can be required to run
# make dist.
d177 1
a177 1
STUB_LIB_FILE		= @@TK_STUB_LIB_FILE@@
d191 1
a192 2
TCL_STUB_LIB_SPEC	= @@TCL_STUB_LIB_SPEC@@
TCL_STUB_LIB_FLAG	= @@TCL_STUB_LIB_FLAG@@
d200 2
a201 2
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
a206 1
STLIB_LD		= @@STLIB_LD@@
a222 1
AR			= @@AR@@
d260 2
a261 2
	tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \
	tkPanedWindow.o tkScale.o tkScrollbar.o
a310 1
	$(GENERIC_DIR)/tkPanedWindow.c \
d388 1
a388 1
	$(CC) $(LDFLAGS) $(WISH_OBJS) \
d396 1
a396 7
	$(MAKE) tcltest

# Resetting the LIB_RUNTIME_DIR below is required so that
# the generated tktest executable gets the build directory
# burned into its ld search path. This keeps tktest from
# picking up an already installed version of the Tcl or
# Tk shared libraries.
d399 1
a399 4
	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)

tktest-real:
	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
a402 4
# FIXME: This xttest rule seems to be broken in a number of ways.
# It should use TK_CC_SEARCH_FLAGS, it does not include the shared
# lib location logic from tktest, and it is not clear where this
# test.o object file comes from.
d404 1
a404 1
	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
d416 5
d428 5
a443 7
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
	./tktest

# This target can be used to run wish from the build directory
# via `make shell` or `make shell SCRIPT=/tmp/foo.tcl`
shell: wish
d447 1
a447 2
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
d450 1
a450 11
	./wish $(SCRIPT)

# This target can be used to run wish inside either gdb or insight
gdb: wish
	@@echo "set env LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}" > gdb.run
	@@echo "set env LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}" >> gdb.run
	@@echo "set env SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}" >> gdb.run
	@@echo "set env TCL_LIBRARY=@@TCL_SRC_DIR@@/library" >> gdb.run
	@@echo "set env TK_LIBRARY=@@TK_SRC_DIR@@/library" >> gdb.run
	gdb ./wish --command=gdb.run
	rm gdb.run
a754 3
tkPanedWindow.o: $(GENERIC_DIR)/tkPanedWindow.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPanedWindow.c

d936 1
a936 1

a937 6
# Regenerate the stubs files.
#

$(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \
		$(GENERIC_DIR)/tkInt.decls
	@@echo "Warning: run \"make genstubs\" to regenerate tkStubInit.c"
d997 2
a998 2
	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
d1026 1
a1026 1
		$(TOP_DIR)/win/aclocal.m4 $(TOP_DIR)/win/tcl.m4 \
a1029 1
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/*.bat
a1030 3
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/makefile.*
	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rules.vc
a1033 1
	cp -p $(TOP_DIR)/win/rc/wish.exe.manifest $(TOP_DIR)/win/rc/
a1036 2
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc
	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest
d1045 1
a1062 6
	    if [ -f $$i ] ; then \
		cp $$i $(DISTDIR)/$$i; \
	    fi; \
	done;)
	mkdir $(DISTDIR)/library/msgs
	@@(cd $(TOP_DIR); for i in library/msgs/*.msg ; do \
@


1.49.4.1
log
@        * Merged in updates from HEAD branch.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.52 2001/06/27 02:06:13 mdejong Exp $
d104 1
a104 6
CFLAGS			= @@CFLAGS@@ @@CFLAGS_DEFAULT@@

# Flags to pass to the linker
LDFLAGS_DEBUG		= @@LDFLAGS_DEBUG@@
LDFLAGS_OPTIMIZE	= @@LDFLAGS_OPTIMIZE@@
LDFLAGS			= @@LDFLAGS@@ @@LDFLAGS_DEFAULT@@
d177 1
a177 1
STUB_LIB_FILE		= @@TK_STUB_LIB_FILE@@
d388 1
a388 1
	$(CC) $(LDFLAGS) $(WISH_OBJS) \
d399 1
a399 1
	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
d404 1
a404 1
	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
a450 12

# This target can be used to run wish from the build directory
# via `make shell` or `make shell SCRIPT=/tmp/foo.tcl`
shell: wish
	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
	export LD_LIBRARY_PATH; \
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
	./wish $(SCRIPT)
@


1.49.4.2
log
@	* Merged in updates from HEAD
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.49.4.1 2001/07/03 20:01:09 dgp Exp $
a211 1
STLIB_LD		= @@STLIB_LD@@
a227 1
AR			= @@AR@@
@


1.48
log
@* win/makefile.vc (install-libraries):
* win/Makefile.in (install-libraries):
* unix/Makefile.in (install-libraries): Added tkPlatDecls.h to
list of header files to install.

* generic/tk.h: Added #include "tkPlatDecls.h", which declares the
platform specific component of the public Tk stubs API's.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.47 2000/06/30 06:38:40 ericm Exp $
d411 3
d423 2
a424 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 $(TCLTESTARGS)
d438 2
a439 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 $(TCLTESTARGS); \
@


1.47
log
@* library/msgs/de.msg: German message catalog.

* library/msgs/en.msg: English message catalog.

* library/msgs/es.msg: Spanish message catalog.

* library/msgs/fr.msg: French message catalog.

* unix/Makefile.in:
* unix/configure.in:
* library/tk.tcl:
* library/clrpick.tcl:
* library/choosedir.tcl:
* library/console.tcl:
* library/msgbox.tcl:
* library/tkfbox.tcl:
* library/xmfbox.tcl:
* library/bgerror.tcl: Applied patches from Laurent Duperval to
provide localization of Tk dialogs. [RFE: 2671].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.46 2000/05/03 00:18:19 hobbs Exp $
d504 2
a505 1
	@@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
@


1.46
log
@	* unix/Makefile.in: added tk.spec to dist target
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45 2000/04/25 21:00:07 hobbs Exp $
d14 1
d422 15
d490 2
a491 1
		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
d519 7
@


1.45
log
@	* unix/Makefile.in:
	* win/Makefile.in: makefile cleanup
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.44 2000/04/04 08:09:31 hobbs Exp $
d968 1
a968 1
		$(UNIX_DIR)/aclocal.m4 \
@


1.45.2.1
log
@Installing more .h files for TclPro
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45 2000/04/25 21:00:07 hobbs Exp $
a348 5
INSTALL_HDRS = $(GENERIC_DIR)/tk.h  \
	$(GENERIC_DIR)/tkInt.h \
	$(GENERIC_DIR)/tkDecls.h \
	$(GENERIC_DIR)/tkIntXlibDecls.h

d487 1
a487 1
	@@for i in $(INSTALL_HDRS) ; \
@


1.45.2.2
log
@see ChangeLog for specific file details
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45.2.1 2000/07/23 04:47:57 welch Exp $
d349 5
a414 3
# Specifying TESTFLAGS on the command line is the standard way to pass
# args to tcltest, ie:
#	% make test TESTFLAGS="-verbose bps -file fileName.test"
d424 1
a424 2
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
	$(TESTFLAGS) $(TCLTESTARGS)
d492 1
a492 2
	@@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
		$(GENERIC_DIR)/tkDecls.h $(GENERIC_DIR)/tkIntXlibDecls.h ; \
a950 5
mklinks:
	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl $(TOP_DIR)/doc/*.[13n] \
		> $(UNIX_DIR)/mkLinks
	chmod +x $(UNIX_DIR)/mkLinks

d965 1
a965 1
dist:   $(UNIX_DIR)/configure mklinks
d973 1
a973 1
		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tk.spec \
d975 1
a975 1
		$(UNIX_DIR)/README $(UNIX_DIR)/mkLinks $(DISTDIR)/unix
d978 3
@


1.45.2.3
log
@unix/Makefile.in (dist): mac no longer had *.exp to dist.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45.2.2 2001/04/04 07:57:17 hobbs Exp $
d1022 1
@


1.45.2.4
log
@updated patchlevel to 8.3.4.
updated READMEs to point to www.tcl-tk.net where applicable.
added proper Win64 support to makefiles.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45.2.3 2001/04/04 22:38:17 hobbs Exp $
d103 1
a103 6
CFLAGS			= @@CFLAGS@@ @@CFLAGS_DEFAULT@@

# Flags to pass to the linker
LDFLAGS_DEBUG		= @@LDFLAGS_DEBUG@@
LDFLAGS_OPTIMIZE	= @@LDFLAGS_OPTIMIZE@@
LDFLAGS			= @@LDFLAGS@@ @@LDFLAGS_DEFAULT@@
d176 1
a176 1
STUB_LIB_FILE		= @@TK_STUB_LIB_FILE@@
a205 1
STLIB_LD		= @@STLIB_LD@@
a221 1
AR			= @@AR@@
d387 1
a387 1
	$(CC) $(LDFLAGS) $(WISH_OBJS) \
d398 1
a398 1
	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
d403 1
a403 1
	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
d951 5
d970 1
a970 1
dist:   $(UNIX_DIR)/configure
d977 2
a978 2
	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
d980 1
a980 1
		$(UNIX_DIR)/README $(DISTDIR)/unix
a982 3
	$(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl $(TOP_DIR)/doc/*.[13n] \
		> $(DISTDIR)/unix/mkLinks
	chmod +x $(DISTDIR)/unix/mkLinks
d1003 1
a1003 1
		$(TOP_DIR)/win/aclocal.m4 $(TOP_DIR)/win/tcl.m4 \
@


1.45.2.5
log
@	* unix/Makefile.in: added shell and gdb targets, prevent
	tkIntXlibDecls.h header from being installed by install-libraries.
	* unix/configure:
	* unix/configure.in: backported improved AIX build support from 8.4.
	* unix/tcl.m4: backported 8.4 changes to HP-UX, IRIX64-6.*, SunOS,
	FreeBSD, AIX and Darwin targets.  Updated SC_LOADTCLCONFIG to
	detect when we build against a Tcl build dir.  Compile with
	-DUSE_TCL_STUBS in the shared case.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45.2.4 2001/10/03 22:04:52 hobbs Exp $
d195 1
a196 2
TCL_STUB_LIB_SPEC	= @@TCL_STUB_LIB_SPEC@@
TCL_STUB_LIB_FLAG	= @@TCL_STUB_LIB_FLAG@@
d204 2
a205 2
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@
a441 22
# This target can be used to run wish from the build directory
# via `make shell` or `make shell SCRIPT=/tmp/foo.tcl`
shell: wish
	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
	export LD_LIBRARY_PATH; \
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
	TCL_LIBRARY=@@TCL_SRC_DIR@@/library; export TCL_LIBRARY; \
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
	./wish $(SCRIPT)

# This target can be used to run wish inside either gdb or insight
gdb: wish
	@@echo "set env LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}" > gdb.run
	@@echo "set env LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}" >> gdb.run
	@@echo "set env SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}" >> gdb.run
	@@echo "set env TCL_LIBRARY=@@TCL_SRC_DIR@@/library" >> gdb.run
	@@echo "set env TK_LIBRARY=@@TK_SRC_DIR@@/library" >> gdb.run
	gdb ./wish --command=gdb.run
	rm gdb.run

d499 1
a499 1
		$(GENERIC_DIR)/tkDecls.h ; \
@


1.45.2.6
log
@	* Removed unnecessary dependence of tktest executable on the tcltest
	executable on Unix.  If there are similar dependencies on other
	platforms, they can probably be removed as well.  [Bug 572134].
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.45.2.5 2002/03/26 02:31:44 hobbs Exp $
d262 3
a264 1
TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o
d399 7
a405 1
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
@


1.44
log
@	* unix/Makefile.in (MAN_INSTALL_DIR): patch to accept --mandir
	correctly [Bug: 4085]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.43 2000/03/30 19:02:31 ericm Exp $
d12 2
a13 2
TCLVERSION = @@TCL_VERSION@@
VERSION = @@TK_VERSION@@
d28 6
a33 2
prefix =		@@prefix@@
exec_prefix =		@@exec_prefix@@
d40 1
a40 1
INSTALL_ROOT =
d45 1
a45 7
TK_LIBRARY =		$(prefix)/lib/tk$(VERSION)

# Path name to use when installing library scripts:
SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(TK_LIBRARY)

# Directory in which to install the .a or .so binary for the Tk library:
LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
d48 1
a48 1
LIB_RUNTIME_DIR =	$(exec_prefix)/lib
d51 1
a51 1
BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
d53 5
a57 2
# Directory from which the program wish should be referenced by scripts:
BIN_DIR =		$(exec_prefix)/bin
d60 1
a60 1
INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
d63 1
a63 1
MAN_INSTALL_DIR =	$(INSTALL_ROOT)@@mandir@@
d66 1
a66 1
MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
d70 1
a70 1
MAN3_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man3
d74 1
a74 1
MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
d79 1
a79 1
TCL_GENERIC_DIR =	@@TCL_SRC_DIR@@/generic
d83 1
a83 1
TCL_BIN_DIR =		@@TCL_BIN_DIR@@
d86 1
a86 1
TCL_LIB_FLAG =		@@TCL_LIB_FLAG@@
d89 1
a89 1
TK_DBGX =		@@TK_DBGX@@
d92 1
a92 1
CFLAGS_WARNING =	@@CFLAGS_WARNING@@
d95 2
a96 2
CFLAGS_DEBUG =		@@CFLAGS_DEBUG@@
CFLAGS_OPTIMIZE =	@@CFLAGS_OPTIMIZE@@
d100 4
a103 4
#CFLAGS = 		$(CFLAGS_DEBUG)
#CFLAGS = 		$(CFLAGS_OPTIMIZE)
#CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
CFLAGS = 		@@CFLAGS@@
d109 1
a109 1
X11_INCLUDES =		@@XINCLUDES@@
d114 1
a114 1
X11_LIB_SWITCHES =	@@XLIBSW@@
d120 2
a121 2
SECURITY_FLAGS =
#SECURITY_FLAGS = -DTK_NO_SECURITY
d125 2
a126 2
PROTO_FLAGS =
#PROTO_FLAGS = -DNO_PROTOTYPE
d132 2
a133 2
MEM_DEBUG_FLAGS =
#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG
d139 2
a140 2
KEYSYM_FLAGS =
#KEYSYM_FLAGS = -DREDO_KEYSYM_LOOKUP
d145 2
a146 2
NO_DEPRECATED_FLAGS= -DTCL_NO_DEPRECATED
#NO_DEPRECATED_FLAGS= -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED
d150 1
a150 1
SHELL =		/bin/sh
d157 10
a166 4
INSTALL = @@srcdir@@/install-sh -c
INSTALL_PROGRAM =	${INSTALL}
INSTALL_DATA =		${INSTALL} -m 644

d173 1
a173 1
SHLIB_CFLAGS = @@SHLIB_CFLAGS@@
d176 1
a176 1
STUB_LIB_FILE = @@STUB_LIB_FILE@@
d178 2
a179 2
TK_STUB_LIB_FILE = @@TK_STUB_LIB_FILE@@
#TK_STUB_LIB_FILE = libtkstub.a
d181 2
a182 2
TK_STUB_LIB_FLAG = @@TK_STUB_LIB_FLAG@@
#TK_STUB_LIB_FLAG = -ltkstub
d184 2
a185 2
TK_LIB_FILE = @@TK_LIB_FILE@@
#TK_LIB_FILE = libtk.a
d187 2
a188 2
TK_LIB_FLAG = @@TK_LIB_FLAG@@
#TK_LIB_FLAG = -ltk
d190 4
a193 4
#TCL_LIB_SPEC = @@TCL_BUILD_LIB_SPEC@@
TCL_LIB_SPEC = @@TCL_LIB_SPEC@@
TK_EXP_FILE = @@TK_EXP_FILE@@
TK_BUILD_EXP_FILE = @@TK_BUILD_EXP_FILE@@
d195 1
a195 1
TCL_STUB_FLAGS = @@TCL_STUB_FLAGS@@
d206 2
a207 2
SHLIB_LD = @@SHLIB_LD@@
SHLIB_LD_LIBS = @@SHLIB_LD_LIBS@@
d212 2
a213 2
TK_CC_SEARCH_FLAGS = @@TK_CC_SEARCH_FLAGS@@
TK_LD_SEARCH_FLAGS = @@TK_LD_SEARCH_FLAGS@@
d221 8
a228 8
AC_FLAGS =		@@EXTRA_CFLAGS@@ @@DEFS@@
RANLIB =		@@RANLIB@@
SRC_DIR =		@@srcdir@@/..
TOP_DIR =		@@srcdir@@/..
GENERIC_DIR =		$(TOP_DIR)/generic
UNIX_DIR = 		@@srcdir@@
BMAP_DIR =		$(TOP_DIR)/bitmaps
TOOL_DIR =		@@TCL_SRC_DIR@@/tools
d236 1
a236 2

CC =		@@CC@@
a245 2


d473 1
a473 1
	@@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
d506 1
a506 1
	@@for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
d910 1
a910 1
	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
d973 1
a973 1
	tclsh $(TCLDIR)/unix/mkLinks.tcl $(TOP_DIR)/doc/*.[13n] \
d1105 1
a1105 1
	tclsh $(TOOL_DIR)/man2html.tcl $(DISTDIR)/tmp ../.. tk$(VERSION)
d1109 1
a1109 1
	tclsh $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
d1187 1
a1187 1
	| tclsh $(TCLDIR)/unix/mkProto.tcl $(TCLVERSION) \
@


1.43
log
@* unix/configure.in: Applied patch from [Bug: 4237]; ensures that
srcdir is fully qualified.

* unix/Makefile.in: Applied patch from [Bug: 4237]; if tcltest was
not compiled, make test/tktest failed.  Now it has a rule to build
tcltest if it has not been built.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.42 2000/03/02 23:53:07 hobbs Exp $
d62 1
a62 1
MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
@


1.42
log
@	* unix/Makefile.in (SCRIPT_INSTALL_DIR): removed extraneous '/'
	* unix/aclocal.m4: corrected TCL_NEEDS_EXP_FILE to be 1 for AIX
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.41 2000/02/14 22:43:32 ericm Exp $
d387 7
a393 1
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
d418 1
a418 1
runtest:
@


1.41
log
@* unix/tk.spec: RPM specification for producing a binary Tk RPM for Linux.

* unix/Makefile.in: Added rpm target to generate Tk binary RPM.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.40 2000/02/10 08:53:14 hobbs Exp $
d44 1
a44 1
SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)/$(TK_LIBRARY)
@


1.40
log
@	* unix/tkUnixWm.c (Tk_CoordsToWindow): qualified delete of error
	handler as the goto label is reached from above and below.

	* unix/configure.in:
	* unix/aclocal.m4: cleaned up macros to coincide with tcl.m4,
	added -export-dynamic to LDFLAGS for FreeBSD-3+ [Bug: 2998]

	* unix/README:
	* unix/Makefile.in (dist): removed porting.notes and porting.old
	from distribution and CVS.  The information was very outdated.  Now
	refer to http://dev.scriptics.com/services/support/platforms.html
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.39 2000/02/08 11:31:36 hobbs Exp $
d921 14
@


1.39
log
@	* generic/tkDecls.h:
	* generic/tk.decls:
	* generic/tk.h: moved new public functions created in dash patch
	to the stubs interface [Bug: 4062]

	* generic/tk.h:
	* doc/CrtImgType.3:
	* doc/CrtPhImgFmt.3:
	* generic/tk.h:
	* generic/tkImgGIF.c:
	* generic/tkImgPhoto.c:
	* generic/tkStubImg.c (new file):
	* generic/tkTest.c:
	* unix/Makefile.in:
	* win/Makefile.in:
	* win/makefile.vc: improved support for moving from the old style
	image C API to the new obj'ified one with new Tk_InitImageArgs
	command and stub'ing of image code.  See docs for how to make the
	transition. [Bug: 4060]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.38 2000/01/16 05:33:08 hobbs Exp $
a945 1
		$(UNIX_DIR)/porting.notes $(UNIX_DIR)/porting.old \
@


1.38
log
@made install less verbose
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.37 2000/01/12 11:46:05 hobbs Exp $
d273 1
a273 1
STUB_LIB_OBJS = tkStubLib.o
d810 3
@


1.37
log
@	* unix/aclocal.m4: strtod bug on Tru64 [Bug: 3378]

	* unix/Makefile.in: added tests to prevent unnecessary chmod +x
	in source dirs while installing [Bug: 3367]

	* unix/configure.in: properly sub'ed in TK_SHARED_BUILD [Bug: 3385]

	* tests/winWm.test:
	* tests/unixWm.test:
	* mac/tkMacWm.c:
	* unix/tkUnixWm.c: fixed possible X error being raised [Bug: 3377]
	* win/tkWinWm.c: wm deiconify in zoom state [Bug: 2077],
	fixed possible flashing of unmapped toplevel in deiconify [Bug: 3338]
	and fixed mapping of transient window [Bug: 572]
	Also, for all wm's, extended 'wm state' command to allow setting
	of the state, and added official support of 'zoomed' state on Win.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.36 2000/01/06 02:22:44 hobbs Exp $
d416 1
a416 2
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
a436 2
	@@echo "Installing $(TK_LIB_FILE)"
	chmod +x $(UNIX_DIR)/install-sh
d443 1
d447 1
a447 1
	@@echo "Installing wish"
d449 1
a449 1
	@@echo "Installing tkConfig.sh"
d452 1
a452 1
	    echo "Installing $(TK_EXP_FILE)"; \
d457 1
a457 1
	    echo "Installing $(TK_STUB_LIB_FILE)"; \
d476 1
a478 1
	    echo "Installing $$i"; \
d481 2
a482 1
	for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
a484 1
	    echo "Installing $$i"; \
d487 2
a488 1
	for i in $(SRC_DIR)/library/images/*; \
a490 1
		echo "Installing $$i"; \
d507 1
a510 1
		echo "Installing $$i"; \
d519 1
a522 1
		echo "Installing $$i"; \
d537 1
a539 1
	    echo "Installing doc/$$i"; \
d545 3
a547 1
	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
a549 1
	    echo "Installing doc/$$i"; \
d555 3
a557 1
	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
a559 1
	    echo "Installing doc/$$i"; \
d565 2
a566 1
	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
@


1.36
log
@	* unix/Makefile.in: added unix/aclocal.m4 to distribution [Bug: 3938]
	* unix/aclocal.m4: changed NetBSD SHLIB_CFLAGS from -fpic to -fPIC
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.35 1999/12/13 23:03:36 wart Exp $
d440 6
a445 1
	chmod +x $(UNIX_DIR)/mkLinks
d475 3
a477 1
	chmod +x $(UNIX_DIR)/install-sh
@


1.35
log
@"make install" now has a dependency on "make all"
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.34 1999/11/12 23:54:22 wart Exp $
d933 1
@


1.34
log
@Added $(TCLTESTARGS) to the test target so that users can set additional
test harness arguments on the make command line:

% make test TCLTESTARGS="-verbose pbs"
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.33 1999/10/20 01:02:34 hobbs Exp $
d422 1
a422 1
install: install-binaries install-libraries install-demos install-doc
@


1.33
log
@	* unix/Makefile.in: added ChangeLog to dist archive
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.32 1999/10/01 22:45:27 hobbs Exp $
d409 1
a409 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0
@


1.32
log
@1999-09-24  Jeff Hobbs  <hobbs@@scriptics.com>

	* */README:
	* win/makefile.vc:
	* */configure.in:
	* generic/tk.h:
	* library/tk.tcl: up'd to 8.3a1

	* unix/Makefile.in: changed 'mkdir' to 'mkdir -p'

	* library/dialog.tcl: changed {Times 18} to {Times 12} for
	dialog font.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.31 1999/09/21 06:43:00 hobbs Exp $
d953 2
a954 2
	cp -p $(TOP_DIR)/changes $(TOP_DIR)/README $(TOP_DIR)/license.terms \
		$(DISTDIR)
@


1.31
log
@1999-09-16  Jeff Hobbs  <hobbs@@scriptics.com>

	* generic/tkFont.c: fixed processing of font options and error
	returned [Bug: 2075]

	* win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the
	wrong toplevel, and changed it to not set focus on overridden
	toplevels

1999-09-15  Jeff Hobbs  <hobbs@@scriptics.com>

	* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070]
	and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX
	version check (readjust from 8-21 fix) and several other config
	fixes for AIX
	* mac/tkMacMenubutton.c:
	* unix/tkUnixMenubu.c: fixed permanently stippled menubutton image
	* win/tkWinButton.c: fixed possible pointer smash [Bug: 2733]

1999-09-14  Jeff Hobbs  <hobbs@@scriptics.com>

	* win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.30 1999/08/21 01:14:45 wart Exp $
d433 1
a433 1
		mkdir $$i; \
d465 1
a465 1
		mkdir $$i; \
d497 1
a497 1
		mkdir $$i; \
d527 1
a527 1
		mkdir $$i; \
d927 1
a927 1
	mkdir $(DISTDIR)
@


1.30
log
@"make doc" now copies the Tcl file "man.macros" locally.  This should allow
users to use the man pages from inside the Tk source tree (without having to
install).  It also fixes some problems that TclX was having when building
its help pages.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.29 1999/08/04 23:42:15 wart Exp $
d200 1
d404 1
d415 1
@


1.29
log
@Added line to make mkLinks executable before it's used.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.28 1999/07/27 16:46:12 redman Exp $
d352 5
a356 1
doc:
@


1.29.4.1
log
@1999-09-21  Jeff Hobbs  <hobbs@@scriptics.com>

	* generic/tkFont.c: fixed processing of font options and error
	returned [Bug: 2075]

	* win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the
	wrong toplevel, and changed it to not set focus on overridden
	toplevels

	* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070]
	and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX
	version check and several other config fixes for AIX

	* mac/tkMacMenubutton.c:
	* unix/tkUnixMenubu.c: fixed permanently stippled menubutton image
	* win/tkWinButton.c: fixed possible pointer smash [Bug: 2733]

	* win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]

	* unix/tkUnixDraw.c: fixed header style for TkpDrawHighlightBorder

	* generic/tkCanvas.c: fixed GC error (bg <> fg) in tkCanvas.c
	(from code added to support TkpDrawHighlightBorder) [Bug: 2676]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.29 1999/08/04 23:42:15 wart Exp $
a199 1
SHLIB_LD_LIBS = @@SHLIB_LD_LIBS@@
d352 1
a352 5
$(SRC_DIR)/doc/man.macros:
	chmod +x $(UNIX_DIR)/install-sh
	$(INSTALL_DATA) @@TCL_SRC_DIR@@/doc/man.macros $(SRC_DIR)/doc/man.macros

doc: $(SRC_DIR)/doc/man.macros
a398 1
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
a408 1
	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
@


1.29.4.2
log
@"make install" now calls "make all" as its first target.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.29.4.1 1999/09/22 06:53:17 hobbs Exp $
d422 1
a422 1
install: all install-binaries install-libraries install-demos install-doc
@


1.29.4.3
log
@1999-09-24  Jeff Hobbs  <hobbs@@scriptics.com>

	* unix/Makefile.in: changed 'mkdir' to 'mkdir -p'
	* library/dialog.tcl: changed {Times 18} to {Times 12} for
	dialog font.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.29.4.2 1999/09/23 22:03:32 wart Exp $
d433 1
a433 1
		mkdir -p $$i; \
d465 1
a465 1
		mkdir -p $$i; \
d497 1
a497 1
		mkdir -p $$i; \
d527 1
a527 1
		mkdir -p $$i; \
d927 1
a927 1
	mkdir -p $(DISTDIR)
@


1.29.4.4
log
@	* unix/Makefile.in: added ChangeLog to source dist
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.29.4.3 1999/09/24 22:18:01 hobbs Exp $
d953 2
a954 2
	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog $(TOP_DIR)/README \
		$(TOP_DIR)/license.terms $(DISTDIR)
@


1.29.2.1
log
@Include the unix/aclocal.m4 file with the distribution.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.29 1999/08/04 23:42:15 wart Exp $
a925 1
		$(UNIX_DIR)/aclocal.m4 \
@


1.28
log
@Fix one more install-sh bug
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.27 1999/07/23 16:21:13 redman Exp $
d433 1
@


1.27
log
@Fix install-sh problem, wrong directory.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.26 1999/07/22 21:51:25 redman Exp $
d462 1
a462 1
	chmod +x $(SRC_DIR)/install-sh
@


1.26
log
@
* Changed version to 8.2b2

* win/tkWinPort.h: Block out include of sys/stat.h in order to
build extensions with MetroWerks compiler for Win32. [Bug: 2385]

* unix/Makefile.in: Need to make install-sh executable before
calling (with chmod +x).  [Bug: 2413]

* library/menu.tcl: Applied patch from Jeff Hobbs to fix typo.
[Bug: 2425]
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.25 1999/07/22 01:32:20 redman Exp $
d432 1
a432 1
	chmod +x $(SRC_DIR)/install-sh
@


1.25
log
@* unix/Makefile.in: Add Windows configure script to distribution.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.24 1999/07/16 21:43:28 redman Exp $
d84 1
a84 1
# The linker flags needed to link in the Tcl library (ex: -ltcl8.1)
d432 1
d462 1
@


1.24
log
@* unix/Makefile.in:
* win/Makefile.in:  Copy the prolog.ps from the generic directory
	for install-libraries.
* unix/aclocal.m4: Check for Alpha/Linux to set the IEEE flag to
	the compiler to be -mieee.  Patch from Don Porter.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.23 1999/07/13 22:19:06 redman Exp $
d949 1
@


1.23
log
@Add .m4 files and Windows configure.in and Makefile.in
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.22 1999/06/30 16:21:26 redman Exp $
d466 1
a466 1
	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/prolog.ps \
@


1.22
log
@Add prolog.ps
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.21 1999/06/22 18:56:57 wart Exp $
d947 5
@


1.21
log
@Updated comments in Makefile.in
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.20 1999/06/18 18:44:01 wart Exp $
d466 2
a467 1
	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
@


1.20
log
@Changed references to LD_FLAGS to LDFLAGS to be consistent with Tcl.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.19 1999/06/16 20:11:29 surles Exp $
d44 1
a44 1
SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(TK_LIBRARY)
@


1.19
log
@modified files to work with new windows Makefiles
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.18 1999/06/15 22:23:19 wart Exp $
d378 1
a378 1
	$(CC) @@LD_FLAGS@@ $(WISH_OBJS) \
d383 1
a383 1
	${CC} @@LD_FLAGS@@ $(TKTEST_OBJS) \
d388 1
a388 1
	${CC} @@LD_FLAGS@@ test.o tkTest.o tkSquare.o \
@


1.18
log
@Changes to make the Tk configure and Makefile.in files TEA compliant.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.17 1999/04/30 18:02:39 redman Exp $
a78 1
TCL_UNIX_DIR =		@@TCL_SRC_DIR@@/unix
@


1.17
log
@removed extra instance of tkConsole.o
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.16 1999/04/28 18:38:04 redman Exp $
d85 3
a89 1
TCL_DBGX =		@@TCL_DBGX@@
d103 1
a103 1
CFLAGS = 		$(@@CFLAGS_DEFAULT@@)
d167 1
a167 1
TK_SHLIB_CFLAGS = @@TK_SHLIB_CFLAGS@@
d184 2
a185 1
TCL_LIB_SPEC = @@TCL_BUILD_LIB_SPEC@@
d232 1
a232 1
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
d347 7
a353 1
all: wish
d416 1
a416 1
install: install-binaries install-libraries install-demos install-man
d512 1
a512 1
install-man:
d1106 1
a1106 1
	$(MAKE) install-libraries install-man \
@


1.16
log
@Add tkConsole.o
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.15 1999/04/20 01:48:00 surles Exp $
d276 1
a276 1
	tkSelect.o tkUtil.o tkVisual.o tkWindow.o tkConsole.o \
@


1.15
log
@modified the Tk makefiel to copy *.decls for a source release
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.14 1999/04/16 01:51:44 stanton Exp $
d273 1
a273 1
	tkColor.o tkConfig.o tkCursor.o tkError.o tkEvent.o \
d276 1
a276 1
	tkSelect.o tkUtil.o tkVisual.o tkWindow.o \
d293 1
a293 1
	$(GENERIC_DIR)/tkGrid.c \
d600 3
@


1.14
log
@* Merged 8.1 branch into the main trunk
@
text
@d8 1
a8 1
# RCS: @@(#) $Id$
d929 1
@


1.13
log
@integrated stubs into 8.0 main branch
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.12 1999/03/06 00:23:43 stanton Exp $
d79 1
d114 1
a132 16
# To enable support for stubs in Tcl.
STUB_LIB_FILE = @@STUB_LIB_FILE@@

TK_STUB_LIB_FILE = @@TK_STUB_LIB_FILE@@
#TK_STUB_LIB_FILE = libtkstub.a

TK_STUB_LIB_FLAG = @@TK_STUB_LIB_FLAG@@
#TK_STUB_LIB_FLAG = -ltkstub



# Libraries to use when linking.  This definition is determined by the
# configure script.
LIBS =  @@TCL_BUILD_LIB_SPEC@@ @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc


d140 6
d167 9
d182 1
d186 7
d228 2
a229 1
CC_SWITCHES =	${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
d233 3
a235 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS}
a237 6
STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
 -DTK_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
d243 1
a243 1
${KEYSYM_FLAGS} -DTK_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
d247 3
a249 1
TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o
d264 5
a268 5
UNIXOBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixCursor.o \
	tkUnixDialog.o tkUnixDraw.o \
	tkUnixEmbed.o tkUnixEvent.o tkUnixFocus.o tkUnixFont.o tkUnixInit.o \
	tkUnixMenu.o tkUnixMenubu.o tkUnixScale.o tkUnixScrlbr.o \
	tkUnixSelect.o tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o
d270 1
a270 2
STUB_LIB_OBJS = tkStubs.o tkIntStubs.o tkIntPlatStubs.o tkPlatStubs.o \
	tkIntXlibStubs.o tkStubLib.o
d275 1
a275 1
	tkMain.o tkOption.o tkPack.o tkPlace.o \
d298 1
a298 1
	$(GENERIC_DIR)/tkButton.c \
d318 1
d320 1
a320 3
	$(GENERIC_DIR)/tkStubs.c $(GENERIC_DIR)/tkIntStubs.c \
	$(GENERIC_DIR)/tkPlatStubs.c $(GENERIC_DIR)/tkIntPlatStubs.c \
	$(GENERIC_DIR)/tkIntXlibStubs.c $(GENERIC_DIR)/tkInitStubs.c \
d324 1
d326 1
a326 1
	$(UNIX_DIR)/tkUnixDialog.c $(UNIX_DIR)/tkUnixDraw.c \
d330 1
d363 1
d370 3
a372 2
	$(CC) @@LD_FLAGS@@ $(WISH_OBJS) @@TK_BUILD_LIB_SPEC@@ $(LIBS) \
		$(TK_CC_SEARCH_FLAGS) -o wish
d375 3
a377 2
	${CC} @@LD_FLAGS@@ $(TKTEST_OBJS) @@TK_BUILD_LIB_SPEC@@ $(LIBS) \
		$(TK_CC_SEARCH_FLAGS) -o tktest
d381 2
a382 2
		@@TK_BUILD_LIB_SPEC@@ $(LIBS) \
		@@TK_LD_SEARCH_FLAGS@@ -lXt -o xttest
d394 2
a395 4
	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
	( echo cd $(TOP_DIR)/tests\; source all\; exit ) \
	| ./tktest -geometry +0+0

d404 1
a404 1
	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
d427 4
a435 4
	@@echo "Installing wish"
	@@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
	@@echo "Installing tkConfig.sh"
	@@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
d453 6
a458 3
	@@echo "Installing tk.h"
	@@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
d564 1
a564 1
	$(CC) -c $(CC_SWITCHES) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
d571 3
a576 3
tkAppInit.o: $(UNIX_DIR)/tkAppInit.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c

d634 6
d692 1
a692 1
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkSquare.c
d746 1
a746 1
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkTest.c
d772 9
d793 3
a798 3
tkUnixDialog.o: $(UNIX_DIR)/tkUnixDialog.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixDialog.c

d818 3
d845 2
a846 2
tkStubInit.o: $(GENERIC_DIR)/tkStubInit.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubInit.c
d848 3
d852 2
a853 2
# Stub library binaries, these must be compiled for use in a shared library
# even though they will be placed in a static archive
d855 4
a858 2
tkStubs.o: $(GENERIC_DIR)/tkStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubs.c
d860 2
a861 11
tkIntStubs.o: $(GENERIC_DIR)/tkIntStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntStubs.c

tkPlatStubs.o: $(GENERIC_DIR)/tkPlatStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkPlatStubs.c

tkIntPlatStubs.o: $(GENERIC_DIR)/tkIntPlatStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntPlatStubs.c

tkIntXlibStubs.o: $(GENERIC_DIR)/tkIntXlibStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntXlibStubs.c
a862 7
tkStubLib.o: $(GENERIC_DIR)/tkStubLib.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubLib.c

.c.o:
	$(CC) -c $(CC_SWITCHES) $<

#
a886 3
#
# Target to check for proper usage of UCHAR macro.
#
a887 10
checkuchar:
	-egrep isalnum\|isalpha\|iscntrl\|isdigit\|islower\|isprint\|ispunct\|isspace\|isupper\|isxdigit\|toupper\|tolower $(SRCS) | grep -v UCHAR

#
# Target to make sure that only symbols with "Tk" prefixes are
# exported.
#

checkexports: $(TK_LIB_FILE)
	-nm -p $(TK_LIB_FILE) | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Tt]k'
d927 2
a928 1
	cp -p $(GENERIC_DIR)/*.c $(GENERIC_DIR)/*.h $(DISTDIR)/generic
d965 1
a965 1
		$(TOP_DIR)/library/tclIndex $(TOP_DIR)/library/prolog.ps \
d996 2
a997 4
		$(TOP_DIR)/tests/visual $(TOP_DIR)/tests/*.tcl \
		$(TOP_DIR)/tests/README $(TOP_DIR)/tests/all \
		$(TOP_DIR)/tests/defs $(TOP_DIR)/tests/option.file* \
		$(DISTDIR)/tests
d1010 1
a1010 1
		compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) $(DISTNAME)
@


1.12
log
@applied Paul Duffin's AIX patch
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.11 1998/10/20 20:02:37 rjohnson Exp $
a112 4
# Libraries to use when linking.  This definition is determined by the
# configure script.
LIBS = @@TCL_BUILD_LIB_SPEC@@ @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc

d131 16
d221 2
a222 1
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} \
d225 8
d237 1
a237 1
${KEYSYM_FLAGS}
d260 4
a263 1
	tkUnixSelect.o tkUnixSend.o tkUnixWm.o tkUnixXId.o
d272 4
d312 3
d345 5
d360 1
a360 1
wish: $(WISH_OBJS) $(TK_LIB_FILE)
d404 1
a404 1
install-binaries: $(TK_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
d427 5
d815 25
d842 25
@


1.11
log
@
Changed config & Makefile to support n32 format on IRIX.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.10 1998/09/23 20:18:03 build Exp $
d169 2
a170 2
TCL_LIB_FLAG = @@TCL_LIB_FLAG@@
#TCL_LIB_FLAG = -ltcl
d368 1
a368 1
install-binaries: $(TK_LIB_FILE) wish
d382 5
@


1.11.4.1
log
@Modified stubs code to work on Unix.  Modified makefile and configure
to add stub support and build against libtclstub.a.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.11 1998/10/20 20:02:37 rjohnson Exp $
d113 4
a134 16
# To enable support for stubs in Tcl.
STUB_LIB_FILE = @@STUB_LIB_FILE@@

TK_STUB_LIB_FILE = @@TK_STUB_LIB_FILE@@
#TK_STUB_LIB_FILE = libtkstub.a

TK_STUB_LIB_FLAG = @@TK_STUB_LIB_FLAG@@
#TK_STUB_LIB_FLAG = -ltkstub



# Libraries to use when linking.  This definition is determined by the
# configure script.
LIBS =  @@TCL_BUILD_STUB_LIB_SPEC@@ @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc


d169 3
d209 1
a209 2
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
a211 7
STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS}\
 -DTK_SHLIB_EXT=\"${SHLIB_SUFFIX}\"

d216 1
a216 1
${KEYSYM_FLAGS} -DTK_SHLIB_EXT=\"${SHLIB_SUFFIX}\" $(STUB_FLAGS)
d239 1
a239 4
	tkUnixSelect.o tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o

STUB_LIB_OBJS = tkStubs.o tkIntStubs.o tkIntPlatStubs.o tkPlatStubs.o \
	tkIntXlibStubs.o
a283 3
	$(GENERIC_DIR)/tkStubs.c $(GENERIC_DIR)/tkIntStubs.c \
	$(GENERIC_DIR)/tkPlatStubs.c $(GENERIC_DIR)/tkIntPlatStubs.c \
	$(GENERIC_DIR)/tkIntXlibStubs.c $(GENERIC_DIR)/tkInitStubs.c \
a313 5
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
	rm -f ${STUB_LIB_FILE}
	@@MAKE_STUB_LIB@@
	$(RANLIB) ${STUB_LIB_FILE}

d324 1
a324 1
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
a767 18

tkStubInit.o: $(GENERIC_DIR)/tkStubInit.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubInit.c

tkStubs.o: $(GENERIC_DIR)/tkStubs.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubs.c

tkIntStubs.o: $(GENERIC_DIR)/tkIntStubs.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkIntStubs.c

tkPlatStubs.o: $(GENERIC_DIR)/tkPlatStubs.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkPlatStubs.c

tkIntPlatStubs.o: $(GENERIC_DIR)/tkIntPlatStubs.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkIntPlatStubs.c

tkIntXlibStubs.o: $(GENERIC_DIR)/tkIntXlibStubs.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkIntXlibStubs.c
@


1.11.4.2
log
@Added stub patches
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.11.4.1 1999/03/06 02:23:18 redman Exp $
d140 1
a140 2
TCL_STUB_FLAGS = @@TCL_STUB_FLAGS@@
#TCL_STUB_FLAGS = -DUSE_TCL_STUBS
a180 3
TK_EXP_FILE = @@TK_EXP_FILE@@
TK_BUILD_EXP_FILE = @@TK_BUILD_EXP_FILE@@

d220 1
a220 2
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
${TCL_STUB_FLAGS}
d226 1
a226 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${TCL_STUB_FLAGS} \
d233 1
a233 1
${KEYSYM_FLAGS} $(TCL_STUB_FLAGS) -DTK_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
a267 4
TK_DECLS = \
	$(GENERIC_DIR)/tk.decls \
	$(GENERIC_DIR)/tkInt.decls

d396 1
a396 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
a409 5
	@@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
	    echo "Installing $(TK_EXP_FILE)"; \
	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
	    fi
a413 5
	@@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(TK_STUB_LIB_FILE)"; \
	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
			 $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
	    fi
d798 1
a798 5
	$(CC) -c $(C__SWITCHES) $(GENERIC_DIR)/tkStubInit.c


# Stub library binaries, these must be compiled for use in a shared library
# even though they will be placed in a static archive
d801 1
a801 1
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubs.c
d804 1
a804 1
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntStubs.c
d807 1
a807 1
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkPlatStubs.c
d810 1
a810 1
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntPlatStubs.c
d813 1
a813 4
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntXlibStubs.c

tkStubLib.o: $(GENERIC_DIR)/tkStubLib.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubLib.c
a816 25

#
# Target to regenerate header files and stub files from the *.decls tables.
#

genstubs:
	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
		$(GENERIC_DIR)/tk.decls $(GENERIC_DIR)/tkInt.decls

#
# Target to check that all exported functions have an entry in the stubs
# tables.
#

checkstubs:
	-@@for i in `nm -p $(TK_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \
		| sort -n`; do \
		match=0; \
		for j in $(TK_DECLS); do \
		    if [ `grep -c $$i $$j` -gt 0 ]; then \
			match=1; \
		    fi; \
		done; \
		if [ $$match -eq 0 ]; then echo $$i; fi \
	done
@


1.11.4.3
log
@Fixed makefile and configure script to properly build wish on Unix.
For new stubs code.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.11.4.2 1999/03/06 23:07:52 stanton Exp $
d140 2
a141 1

d145 1
a145 1
LIBS =  @@TCL_BUILD_LIB_SPEC@@ @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
d224 2
a225 2
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS}

d231 1
a231 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
d238 1
a238 1
${KEYSYM_FLAGS} -DTK_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
d264 1
a264 1
	tkIntXlibStubs.o tkStubLib.o
d817 1
a817 1
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubInit.c
@


1.10
log
@Removed "sccs" commands from "Makefile.in" to facilititate switch over to CVS.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.9 1998/09/14 18:23:54 stanton Exp $
d190 1
a190 1
AC_FLAGS =		@@DEFS@@
@


1.9
log
@Replaced SCCS strings, fixed binary files
@
text
@d8 1
a8 1
# RCS: @@(#) $Id$
d841 1
a841 4
	sccs edit -s $(TOP_DIR)/mac/tkMacProjects.sea.hqx
	cp -p tkMacProjects.sea.hqx $(DISTDIR)/mac
	sccs unedit $(TOP_DIR)/mac/tkMacProjects.sea.hqx
	rm -f tkMacProjects.sea.hqx
@


1.8
log
@added SHLIB_PATH to test targets for HPUX
@
text
@d8 1
a8 1
# SCCS: @@(#) Makefile.in 1.146 97/11/05 11:10:45
@


1.7
log
@DGBX changes
@
text
@d344 2
d356 2
@


1.6
log
@Added support for specifying warning flags for the compiler, with checks
for gcc and appropriate defaults.
@
text
@d85 2
a86 1
DBGX =			@@DBGX@@
@


1.5
log
@Merged changes between child workspace "/home/escoffon/ws/tk8.0" and
 parent workspace "/export/home/ws/tk8.0".
@
text
@d87 3
d206 2
a207 1
CC_SWITCHES =	${CFLAGS} ${TK_SHLIB_CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
@


1.4
log
@Updated dist target
@
text
@d162 6
d304 2
a305 2
@@TK_LIB_FILE@@: ${OBJS}
	rm -f @@TK_LIB_FILE@@
d307 1
a307 1
	$(RANLIB) @@TK_LIB_FILE@@
@


1.3
log
@- added support for configuration of debug/nodebug in configure script.
- also added a atring to append to generated libraries when built with
symbols.
@
text
@d817 1
d826 4
a829 4
	sccs edit -s $(TOP_DIR)/mac/tkMacProjects.sit.hqx
	cp -p tkMacProjects.sit.hqx $(DISTDIR)/mac
	sccs unedit $(TOP_DIR)/mac/tkMacProjects.sit.hqx
	rm -f tkMacProjects.sit.hqx
d927 1
a927 1
	rm -f $(DISTDIR)/mac/tkMacProjects.sit.hqx
@


1.3.1.1
log
@added TK_LIB_FLAG and changed some macro references from configure macros to
make macros, so that they can be overridden on the make command line.
@
text
@a161 3
TK_LIB_FLAG = @@TK_LIB_FLAG@@
#TK_LIB_FLAG = -ltk

d298 2
a299 2
${TK_LIB_FILE}: ${OBJS}
	rm -f ${TK_LIB_FILE}
d301 1
a301 1
	$(RANLIB) ${TK_LIB_FILE}
@


1.3.1.2
log
@added the TCL_LIB_FLAG macro
@
text
@a164 3
TCL_LIB_FLAG = @@TCL_LIB_FLAG@@
#TCL_LIB_FLAG = -ltcl

@


1.2
log
@Generalized "make dist
@
text
@d84 14
a112 4
# To change the compiler switches, for example to change from -O
# to -g, change the following line:
CFLAGS = -O

@


1.1
log
@Initial revision
@
text
@d467 1
a467 1
		SUNWtk.* prototype
d768 1
d771 1
a771 1
DISTDIR =	/proj/tcl/dist/$(DISTNAME)
a867 1
	cp /home/ouster/papers/tk4.0/tk4.0.ps $(DISTDIR)/doc
d881 4
a884 4
	rm -f /proj/tcl/dist/$(DISTNAME).tar.Z \
		/proj/tcl/dist/$(DISTNAME).tar.gz \
		/proj/tcl/dist/$(ZIPNAME)
	cd /proj/tcl/dist; tar cf $(DISTNAME).tar $(DISTNAME); \
d897 6
a902 6
	rm -f /proj/tcl/dist/$(DISTNAME).tar.Z \
		/proj/tcl/dist/$(DISTNAME).tar.gz \
		/proj/tcl/dist/$(ZIPNAME)
	mv /proj/tcl/dist/tk${VERSION} /proj/tcl/dist/old
	mv /proj/tcl/dist/$(DISTNAME) /proj/tcl/dist/tk${VERSION}
	cd /proj/tcl/dist; tar cf $(DISTNAME).tar tk${VERSION}; \
d905 2
a906 2
	mv /proj/tcl/dist/tk${VERSION} /proj/tcl/dist/$(DISTNAME)
	mv /proj/tcl/dist/old /proj/tcl/dist/tk${VERSION}
d937 2
a938 2
# take place.  These steps will generate the SUNWtk.sun4 and
# SUNWtk.i86pc stream packages.  It is important that the packages be
d944 2
d1002 2
a1003 2
	pkgtrans -s . SUNWtk.`arch` SUNWtk
	rm -rf SUNWtk
@


1.1.4.1
log
@initial tk8.1a2 version
@
text
@d8 1
a8 1
# SCCS: @@(#) Makefile.in 1.154 98/02/10 10:24:55
a78 1
TCL_UNIX_DIR =		@@TCL_SRC_DIR@@/unix
a127 6
# Tk does not used deprecated Tcl constructs so it should
# compile fine with -DTCL_NO_DEPRECATED. To remove its own
# set of deprecated code uncomment the second line.
NO_DEPRECATED_FLAGS= -DTCL_NO_DEPRECATED
#NO_DEPRECATED_FLAGS= -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED

d189 1
a189 1
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}
d199 1
a199 2
TCLTEST_OBJS = ${TCL_BIN_DIR}/tclTest.o ${TCL_BIN_DIR}/tclUnixTest.o
TKTEST_OBJS = $(TCLTEST_OBJS) tkTestInit.o tkTest.o tkSquare.o
d214 5
a218 5
UNIXOBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \
	tkUnixCursor.o tkUnixDraw.o tkUnixEmbed.o tkUnixEvent.o \
	tkUnixFocus.o tkUnixFont.o tkUnixInit.o tkUnixKey.o tkUnixMenu.o \
	tkUnixMenubu.o tkUnixScale.o tkUnixScrlbr.o tkUnixSelect.o \
	tkUnixSend.o tkUnixWm.o tkUnixXId.o
d223 1
a223 1
	tkMain.o tkObj.o tkOldConfig.o tkOption.o tkPack.o tkPlace.o \
d242 1
a242 1
	$(GENERIC_DIR)/tkButton.c $(GENERIC_DIR)/tkObj.c \
a261 1
	$(GENERIC_DIR)/tkOldConfig.c \
a265 1
	$(UNIX_DIR)/tkUnixConfig.c \
d267 1
a267 1
	$(UNIX_DIR)/tkUnixDraw.c \
a270 1
	$(UNIX_DIR)/tkUnixKey.c \
a322 2
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
d324 1
a324 1
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
a332 2
	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
	export SHLIB_PATH; \
d334 1
a334 1
	TK_LIBRARY=@@TK_SRC_DIR@@/library; export TK_LIBRARY; \
d375 1
a375 1
	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
a550 6
tkObj.o: $(GENERIC_DIR)/tkObj.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkObj.c

tkOldConfig.o: $(GENERIC_DIR)/tkOldConfig.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkOldConfig.c

a694 3
tkUnixConfig.o: $(UNIX_DIR)/tkUnixConfig.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixConfig.c

d698 3
a719 3
tkUnixKey.o: $(UNIX_DIR)/tkUnixKey.c
	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixKey.c

d799 1
a799 2
	cp -p $(GENERIC_DIR)/*.c $(GENERIC_DIR)/*.h $(GENERIC_DIR)/prolog.ps \
		$(DISTDIR)/generic
d838 1
a838 1
		$(TOP_DIR)/library/tclIndex \
d881 4
a884 4
	rm -f $(DISTDIR)/../$(DISTNAME).tar.Z \
		$(DISTDIR)/../$(DISTNAME).tar.gz \
		$(DISTDIR)/../$(ZIPNAME)
	cd $(DISTDIR)/..; tar cf $(DISTNAME).tar $(DISTNAME); \
@


1.1.4.2
log
@Merged 8.0.3 changes into 8.1
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.10 1998/09/23 20:18:03 build Exp $
a84 18
# Libraries built with optimization switches have this additional extension
TK_DBGX =		@@TK_DBGX@@
TCL_DBGX =		@@TCL_DBGX@@

# warning flags
CFLAGS_WARNING =	@@CFLAGS_WARNING@@

# The default switches for optimization or debugging
CFLAGS_DEBUG =		@@CFLAGS_DEBUG@@
CFLAGS_OPTIMIZE =	@@CFLAGS_OPTIMIZE@@

# To change the compiler switches, for example to change from optimization to
# debugging symbols, change the following line:
#CFLAGS = 		$(CFLAGS_DEBUG)
#CFLAGS = 		$(CFLAGS_OPTIMIZE)
#CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
CFLAGS = 		$(@@CFLAGS_DEFAULT@@)

d100 4
a158 6
TK_LIB_FLAG = @@TK_LIB_FLAG@@
#TK_LIB_FLAG = -ltk

TCL_LIB_FLAG = @@TCL_LIB_FLAG@@
#TCL_LIB_FLAG = -ltcl

d194 1
a194 2
CC_SWITCHES =	${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
d299 2
a300 2
${TK_LIB_FILE}: ${OBJS}
	rm -f ${TK_LIB_FILE}
d302 1
a302 1
	$(RANLIB) ${TK_LIB_FILE}
d482 1
a482 1
		$(PACKAGE).* prototype
a791 1
DISTROOT = /tmp/dist
d794 1
a794 1
DISTDIR =	$(DISTROOT)/$(DISTNAME)
a830 1
	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
d839 4
a842 1
	cp -p $(TOP_DIR)/mac/tkMacProjects.sea.hqx $(DISTDIR)/mac
d892 1
d906 4
a909 4
	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
		$(DISTROOT)/$(DISTNAME).tar.gz \
		$(DISTROOT)/$(ZIPNAME)
	cd $(DISTROOT); tar cf $(DISTNAME).tar $(DISTNAME); \
d922 6
a927 6
	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
		$(DISTROOT)/$(DISTNAME).tar.gz \
		$(DISTROOT)/$(ZIPNAME)
	mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/old
	mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tk${VERSION}
	cd $(DISTROOT); tar cf $(DISTNAME).tar tk${VERSION}; \
d930 2
a931 2
	mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/$(DISTNAME)
	mv $(DISTROOT)/old $(DISTROOT)/tk${VERSION}
d941 1
a941 1
	rm -f $(DISTDIR)/mac/tkMacProjects.sea.hqx
d962 2
a963 2
# take place.  These steps will generate the $(PACKAGE).sun4 and
# $(PACKAGE).i86pc stream packages.  It is important that the packages be
a968 2
PACKAGE=SCRPtk

d1025 2
a1026 2
	pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
	rm -rf $(PACKAGE)
@


1.1.4.3
log
@* integrated tk8.0.4 changes.

* generic/tkBind.c: fixed deletion order bug where a crash would
result if a binding deleted "."
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.2 1998/09/30 02:19:10 stanton Exp $
d197 1
a197 1
AC_FLAGS =		@@EXTRA_CFLAGS@@ @@DEFS@@
@


1.1.4.4
log
@Added tclUnixTest.o to the list of TCLTEST_OBJS for Tk.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.3 1998/11/25 21:16:40 stanton Exp $
d227 1
a227 2
TCLTEST_OBJS = ${TCL_BIN_DIR}/tclTest.o ${TCL_BIN_DIR}/tclThreadTest.o \
        ${TCL_BIN_DIR}/tclUnixTest.o
@


1.1.4.5
log
@integrated stubs from development branch
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.4 1999/02/16 12:03:59 lfb Exp $
d114 3
a169 9
# To enable support for stubs in Tcl.
STUB_LIB_FILE = @@STUB_LIB_FILE@@

TK_STUB_LIB_FILE = @@TK_STUB_LIB_FILE@@
#TK_STUB_LIB_FILE = libtkstub.a

TK_STUB_LIB_FLAG = @@TK_STUB_LIB_FLAG@@
#TK_STUB_LIB_FLAG = -ltkstub

d176 2
a177 10
TCL_LIB_SPEC = @@TCL_BUILD_LIB_SPEC@@
TK_EXP_FILE = @@TK_EXP_FILE@@
TK_BUILD_EXP_FILE = @@TK_BUILD_EXP_FILE@@

TCL_STUB_FLAGS = @@TCL_STUB_FLAGS@@

# Libraries to use when linking.  This definition is determined by the
# configure script.
LIBS = @@SHLIB_LD_LIBS@@ @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
d216 1
a216 2
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} ${TCL_STUB_FLAGS} \
a218 13
WISH_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}

STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}


d248 1
a248 4
	tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o

STUB_LIB_OBJS = tkStubs.o tkIntStubs.o tkIntPlatStubs.o tkPlatStubs.o \
	tkIntXlibStubs.o tkStubLib.o
a256 4
TK_DECLS = \
	$(GENERIC_DIR)/tk.decls \
	$(GENERIC_DIR)/tkInt.decls

a293 3
	$(GENERIC_DIR)/tkStubs.c $(GENERIC_DIR)/tkIntStubs.c \
	$(GENERIC_DIR)/tkPlatStubs.c $(GENERIC_DIR)/tkIntPlatStubs.c \
	$(GENERIC_DIR)/tkIntXlibStubs.c $(GENERIC_DIR)/tkInitStubs.c \
a325 5
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
	rm -f ${STUB_LIB_FILE}
	@@MAKE_STUB_LIB@@
	$(RANLIB) ${STUB_LIB_FILE}

a330 1

d336 2
a337 2
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
	$(CC) @@LD_FLAGS@@ $(WISH_OBJS) @@TK_BUILD_LIB_SPEC@@ $(WISH_LIBS) \
d380 1
a380 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
a397 10
	@@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
	    echo "Installing $(TK_EXP_FILE)"; \
	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
	    fi
	@@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(TK_STUB_LIB_FILE)"; \
	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
			 $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
	    fi
a524 3
tkAppInit.o: $(UNIX_DIR)/tkAppInit.c
	$(CC) -c $(WISH_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c

d528 3
a725 25
tkStubInit.o: $(GENERIC_DIR)/tkStubInit.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubInit.c

# Stub library binaries, these must be compiled for use in a shared library
# even though they will be placed in a static archive

tkStubs.o: $(GENERIC_DIR)/tkStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubs.c

tkIntStubs.o: $(GENERIC_DIR)/tkIntStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntStubs.c

tkPlatStubs.o: $(GENERIC_DIR)/tkPlatStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkPlatStubs.c

tkIntPlatStubs.o: $(GENERIC_DIR)/tkIntPlatStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntPlatStubs.c

tkIntXlibStubs.o: $(GENERIC_DIR)/tkIntXlibStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntXlibStubs.c

tkStubLib.o: $(GENERIC_DIR)/tkStubLib.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubLib.c


a806 26

# Target to regenerate header files and stub files from the *.decls tables.
#

genstubs:
	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
		$(GENERIC_DIR)/tk.decls $(GENERIC_DIR)/tkInt.decls

#
# Target to check that all exported functions have an entry in the stubs
# tables.
#

checkstubs:
	-@@for i in `nm -p $(TK_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \
		| sort -n`; do \
		match=0; \
		for j in $(TK_DECLS); do \
		    if [ `grep -c $$i $$j` -gt 0 ]; then \
			match=1; \
		    fi; \
		done; \
		if [ $$match -eq 0 ]; then echo $$i; fi \
	done


@


1.1.4.6
log
@Fix problems with tktest and configuration problems with vs. without
stubs.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.5 1999/03/10 07:13:49 stanton Exp $
d381 2
a382 3
	$(CC) @@LD_FLAGS@@ $(WISH_OBJS) \
		@@TK_BUILD_LIB_SPEC@@ \
		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
d385 2
a386 3
	${CC} @@LD_FLAGS@@ $(TKTEST_OBJS) \
		@@TK_BUILD_LIB_SPEC@@ \
		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest
d390 2
a391 2
		@@TK_BUILD_LIB_SPEC@@ \
		$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
@


1.1.4.7
log
@"make test" now invokes the test suite from the current working dir so
that you can call "make test" on multiple platforms simultaneously.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.6 1999/03/11 00:48:54 redman Exp $
d406 3
a408 1
	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0
@


1.1.4.8
log
@Fixed ref to all.tcl and defs.tcl in make dist target
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.7 1999/03/11 19:01:59 hershey Exp $
d1021 2
a1022 2
		$(TOP_DIR)/tests/README $(TOP_DIR)/tests/all.tcl \
		$(TOP_DIR)/tests/defs.tcl $(TOP_DIR)/tests/option.file* \
@


1.1.4.9
log
@* unix/configure.in: Added missing stub related definitions.

* unix/Makefile.in: Install tkDecls.h in addition to tk.h.

* generic/tkStubLib.c: Added flags to ensure we are using Tcl
stub macros.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id$
d464 2
a465 5
	@@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
	    do \
	    echo "Installing $$i"; \
	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
	    done;
@


1.1.4.10
log
@Remove stub functions.  Always use stubs when building with --enable-shared
(which is the default).  Wish links to -ltcl and -ltk (the real libraries).
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.9 1999/03/14 19:26:03 stanton Exp $
d190 1
a190 1
LIBS = @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
d228 5
d234 1
a234 1
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
d240 5
a244 2
CC_SWITCHES = ${CC_SWITCHES_NO_STUBS} ${TCL_STUB_FLAGS} 

d278 2
a279 1
STUB_LIB_OBJS = tkStubLib.o
d329 3
d575 1
a575 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) -DTK_TEST $(UNIX_DIR)/tkAppInit.c
d583 1
a583 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(UNIX_DIR)/tkAppInit.c
d703 1
a703 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(GENERIC_DIR)/tkSquare.c
d757 1
a757 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(GENERIC_DIR)/tkTest.c
d789 15
d805 1
a805 1
	$(CC) -c $(CC_SWITCHES_NO_STUBS) $(GENERIC_DIR)/tkStubLib.c
@


1.1.4.11
log
@Remove the DDE code.

Modified stubs based on Jan's patch.
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.10 1999/03/30 02:08:03 redman Exp $
d268 1
a268 1
	tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o tkStubLib.o
a319 1
	$(GENERIC_DIR)/tkStubInit.c $(GENERIC_DIR)/tkStubLib.c \
d778 2
a779 1
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubLib.c
@


1.1.4.12
log
@removed reference to "tests/visual"--the file is now called "visual_bb.test".
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.11 1999/04/01 21:58:51 redman Exp $
d996 4
a999 2
		$(TOP_DIR)/tests/*.tcl $(TOP_DIR)/tests/README \
		$(TOP_DIR)/tests/option.file* $(DISTDIR)/tests
@


1.1.4.13
log
@Minor fix to dist scripts
man page lint
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.12 1999/04/06 02:57:58 hershey Exp $
d1010 1
a1010 1
		compress $(DISTNAME).tar; zip -qr8 $(ZIPNAME) $(DISTNAME)
@


1.1.4.4.2.1
log
@merge 8.0.6 code for stubs into 8.1 for UNIX
@
text
@d8 1
a8 1
# RCS: @@(#) $Id: Makefile.in,v 1.1.4.4 1999/02/16 12:03:59 lfb Exp $
d114 3
a169 9
# To enable support for stubs in Tcl.
STUB_LIB_FILE = @@STUB_LIB_FILE@@

TK_STUB_LIB_FILE = @@TK_STUB_LIB_FILE@@
#TK_STUB_LIB_FILE = libtkstub.a

TK_STUB_LIB_FLAG = @@TK_STUB_LIB_FLAG@@
#TK_STUB_LIB_FLAG = -ltkstub

d176 2
a177 10
TCL_LIB_SPEC = @@TCL_BUILD_LIB_SPEC@@
TK_EXP_FILE = @@TK_EXP_FILE@@
TK_BUILD_EXP_FILE = @@TK_BUILD_EXP_FILE@@

TCL_STUB_FLAGS = @@TCL_STUB_FLAGS@@

# Libraries to use when linking.  This definition is determined by the
# configure script.
LIBS = @@SHLIB_LD_LIBS@@ @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
WISH_LIBS = $(TCL_LIB_SPEC) @@LIBS@@ $(X11_LIB_SWITCHES) @@DL_LIBS@@ @@MATH_LIBS@@ -lc
d216 1
a216 2
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} ${TCL_STUB_FLAGS} \
a218 13
WISH_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}

STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} \
${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}


d248 1
a248 4
	tkUnixSend.o tkUnixWm.o tkUnixXId.o tkStubInit.o

STUB_LIB_OBJS = tkStubs.o tkIntStubs.o tkIntPlatStubs.o tkPlatStubs.o \
	tkIntXlibStubs.o tkStubLib.o
a256 4
TK_DECLS = \
	$(GENERIC_DIR)/tk.decls \
	$(GENERIC_DIR)/tkInt.decls

a293 3
	$(GENERIC_DIR)/tkStubs.c $(GENERIC_DIR)/tkIntStubs.c \
	$(GENERIC_DIR)/tkPlatStubs.c $(GENERIC_DIR)/tkIntPlatStubs.c \
	$(GENERIC_DIR)/tkIntXlibStubs.c $(GENERIC_DIR)/tkInitStubs.c \
a325 5
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
	rm -f ${STUB_LIB_FILE}
	@@MAKE_STUB_LIB@@
	$(RANLIB) ${STUB_LIB_FILE}

a330 1

d336 2
a337 2
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
	$(CC) @@LD_FLAGS@@ $(WISH_OBJS) @@TK_BUILD_LIB_SPEC@@ $(WISH_LIBS) \
d380 1
a380 1
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
a397 10
	@@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
	    echo "Installing $(TK_EXP_FILE)"; \
	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
	    fi
	@@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(TK_STUB_LIB_FILE)"; \
	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
			 $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
	    fi
a524 3
tkAppInit.o: $(UNIX_DIR)/tkAppInit.c
	$(CC) -c $(WISH_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c

d528 3
a725 25
tkStubInit.o: $(GENERIC_DIR)/tkStubInit.c
	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkStubInit.c

# Stub library binaries, these must be compiled for use in a shared library
# even though they will be placed in a static archive

tkStubs.o: $(GENERIC_DIR)/tkStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubs.c

tkIntStubs.o: $(GENERIC_DIR)/tkIntStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntStubs.c

tkPlatStubs.o: $(GENERIC_DIR)/tkPlatStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkPlatStubs.c

tkIntPlatStubs.o: $(GENERIC_DIR)/tkIntPlatStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntPlatStubs.c

tkIntXlibStubs.o: $(GENERIC_DIR)/tkIntXlibStubs.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkIntXlibStubs.c

tkStubLib.o: $(GENERIC_DIR)/tkStubLib.c
	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tkStubLib.c


a806 26

# Target to regenerate header files and stub files from the *.decls tables.
#

genstubs:
	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
		$(GENERIC_DIR)/tk.decls $(GENERIC_DIR)/tkInt.decls

#
# Target to check that all exported functions have an entry in the stubs
# tables.
#

checkstubs:
	-@@for i in `nm -p $(TK_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \
		| sort -n`; do \
		match=0; \
		for j in $(TK_DECLS); do \
		    if [ `grep -c $$i $$j` -gt 0 ]; then \
			match=1; \
		    fi; \
		done; \
		if [ $$match -eq 0 ]; then echo $$i; fi \
	done


@


