1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
--- Makefile.in.orig Thu Feb 11 18:11:46 1999
+++ Makefile.in Sun Dec 5 07:04:11 1999
@@ -1,7 +1,7 @@
# Makefile --
#
# This file is a Makefile to compile Tix with Tk version
-# 8.0. If it has the name "Makefile.in" then it is a
+# 8.2. 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
@@ -59,27 +59,27 @@
# determine which shell to use for executing commands:
SHELL = /bin/sh
-# Location of the Tcl 8.0 source directory.
+# Location of the Tcl 8.2 source directory.
#
TCL_SRC_DIR = @TCL_SRC_DIR@
TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic
-# Location of the Tk 8.0 source directory.
+# Location of the Tk 8.2 source directory.
#
TK_SRC_DIR = @TK_SRC_DIR@
TK_GENERIC_DIR = $(TK_SRC_DIR)/generic
# Libraries to use when linking:
-LIBS = @ITK_BUILD_LIB_SPEC@ @ITCL_BUILD_LIB_SPEC@ \
- @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ @TK_LIBS@
+LIBS = @ITK_LIB_SPEC@ @ITCL_LIB_SPEC@ \
+ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
# Libraries for building a stand-alone Tclsh.
#
-LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@
+LIBS_TCLONLY = @TCL_LIB_SPEC@ @TCL_LIBS@
-RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
- TK_LIBRARY=$(TK_SRC_DIR)/library \
- $(TCL_SRC_DIR)/unix/tclsh
+RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.2 \
+ TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.2 \
+ $(TCL_SRC_DIR)/../../bin/tclsh8.2
#----------------------------------------------------------------
@@ -117,10 +117,10 @@
TK_SAMEXE_FILE = @TK_SAMEXE_FILE@
TIX_SAMEXE_FILE = @TIX_SAMEXE_FILE@
-INST_EXE = $(TIX_EXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT)
-INST_TIX_SAMEXE = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT)
-INST_TK_SAMEXE = $(TK_SAMEXE_FILE)8.0
-INST_TCL_SAMEXE = $(TCL_SAMEXE_FILE)8.0
+INST_EXE = $(TIX_EXE_FILE)$(TIX_VERSION).8.2$(ITCL_EXT)
+INST_TIX_SAMEXE = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.2$(ITCL_EXT)
+INST_TK_SAMEXE = $(TK_SAMEXE_FILE)8.2
+INST_TCL_SAMEXE = $(TCL_SAMEXE_FILE)8.2
SAM_TARGETS = $(TIX_SAM_FILE)
@@ -210,30 +210,30 @@
# scripts of TK must be included in the fixed order.
#----------------------------------------------------------------------
-TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.2/*.tcl
TK_SCRIPTS = \
- $(TK_SRC_DIR)/library/bgerror.tcl \
- $(TK_SRC_DIR)/library/dialog.tcl \
- $(TK_SRC_DIR)/library/focus.tcl \
- $(TK_SRC_DIR)/library/obsolete.tcl \
- $(TK_SRC_DIR)/library/optMenu.tcl \
- $(TK_SRC_DIR)/library/palette.tcl \
- $(TK_SRC_DIR)/library/tearoff.tcl \
- $(TK_SRC_DIR)/library/clrpick.tcl \
- $(TK_SRC_DIR)/library/comdlg.tcl \
- $(TK_SRC_DIR)/library/msgbox.tcl \
- $(TK_SRC_DIR)/library/tkfbox.tcl \
- $(TK_SRC_DIR)/library/xmfbox.tcl \
- $(SRC_DIR)/generic/tk4.2/tk.tcl \
- $(TK_SRC_DIR)/library/button.tcl \
- $(TK_SRC_DIR)/library/entry.tcl \
- $(TK_SRC_DIR)/library/listbox.tcl \
- $(TK_SRC_DIR)/library/menu.tcl \
- $(TK_SRC_DIR)/library/scale.tcl \
- $(TK_SRC_DIR)/library/scrlbar.tcl \
- $(TK_SRC_DIR)/library/text.tcl \
- $(SRC_DIR)/generic/tk8.0/console.tcl
+ $(TK_SRC_DIR)/../../lib/tk8.2/bgerror.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/dialog.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/focus.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/obsolete.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/optMenu.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/palette.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/tearoff.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/clrpick.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/comdlg.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/msgbox.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/tkfbox.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/xmfbox.tcl \
+ $(SRC_DIR)/generic/tk8.2/tk.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/button.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/entry.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/listbox.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/menu.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/scale.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/scrlbar.tcl \
+ $(TK_SRC_DIR)/../../lib/tk8.2/text.tcl \
+ $(SRC_DIR)/generic/tk8.2/console.tcl
TIX_SCRIPTS = \
$(SRC_DIR)/library/pref/*.fsc \
@@ -372,7 +372,7 @@
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixImgXpm.c
tixInit.o: $(GENERIC_DIR)/tixInit.c
- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixInit.c
+ $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixInit.c -DTIX_LIBRARY=\"$(TIX_LIBRARY)\"
tixItcl.o: $(GENERIC_DIR)/tixItcl.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixItcl.c
|
