Fossil SCM

Fix --with-tcl build broken by [d77b7ed1a0]. Because FOSSIL_ENABLE_TCL was defined always (either as "0", either as "@FOSSIL_ENABLE_TCL@", selection on it in the Makefile makes no sence anyway.

jan.nijtmans 2014-04-02 12:57 trunk
Commit a8e3ede965cf2856ffd737670b50766705861c9b
Parent b763c3c3eb68328…
5 files changed +1 -8 +5 -25 +2 -7 +1 -7 +2 -8
~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/main.mk
+1 -8
--- src/main.mk
+++ src/main.mk
@@ -400,18 +400,11 @@
400400
 # using -lsqlite3.
401401
 SQLITE3_OBJ.1 =
402402
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
403403
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
404404
405
-# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
406
-# If it is set to 1, then we need to build the Tcl integration code and
407
-# link to the Tcl library.
408
-TCL_OBJ.0 =
409
-TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
410
-TCL_OBJ. = $(TCL_OBJ.0)
411
-
412
-EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
405
+EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
413406
414407
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
415408
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
416409
417410
 # This rule prevents make from using its default rules to try build
418411
--- src/main.mk
+++ src/main.mk
@@ -400,18 +400,11 @@
400 # using -lsqlite3.
401 SQLITE3_OBJ.1 =
402 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
403 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
404
405 # The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
406 # If it is set to 1, then we need to build the Tcl integration code and
407 # link to the Tcl library.
408 TCL_OBJ.0 =
409 TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
410 TCL_OBJ. = $(TCL_OBJ.0)
411
412 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
413
414 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
415 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
416
417 # This rule prevents make from using its default rules to try build
418
--- src/main.mk
+++ src/main.mk
@@ -400,18 +400,11 @@
400 # using -lsqlite3.
401 SQLITE3_OBJ.1 =
402 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
403 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
404
405 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
 
 
 
 
 
 
 
406
407 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
408 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
409
410 # This rule prevents make from using its default rules to try build
411
M src/makemake.tcl
+5 -25
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -268,23 +268,16 @@
268268
 # using -lsqlite3.
269269
 SQLITE3_OBJ.1 =
270270
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
271271
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
272272
273
-# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
274
-# If it is set to 1, then we need to build the Tcl integration code and
275
-# link to the Tcl library.
276
-TCL_OBJ.0 =
277
-TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
278
-TCL_OBJ. = $(TCL_OBJ.0)
279
-
280273
 EXTRAOBJ = \
281274
 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
282275
 $(OBJDIR)/shell.o \
283276
 $(OBJDIR)/th.o \
284277
 $(OBJDIR)/th_lang.o \
285
- $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) \
278
+ $(OBJDIR)/th_tcl.o \
286279
 $(OBJDIR)/cson_amalgamation.o
287280
288281
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
289282
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
290283
@@ -724,16 +717,13 @@
724717
 EXTRAOBJ = \
725718
 $(OBJDIR)/sqlite3.o \
726719
 $(OBJDIR)/shell.o \
727720
 $(OBJDIR)/th.o \
728721
 $(OBJDIR)/th_lang.o \
722
+ $(OBJDIR)/th_tcl.o \
729723
 $(OBJDIR)/cson_amalgamation.o
730724
731
-ifdef FOSSIL_ENABLE_TCL
732
-EXTRAOBJ += $(OBJDIR)/th_tcl.o
733
-endif
734
-
735725
 zlib:
736726
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
737727
738728
 clean-zlib:
739729
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
@@ -824,14 +814,12 @@
824814
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
825815
826816
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
827817
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
828818
829
-writeln {ifdef FOSSIL_ENABLE_TCL
830
-$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
831
- $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
832
-endif}
819
+writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
820
+writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
833821
834822
 close $output_file
835823
 #
836824
 # End of the win/Makefile.mingw output
837825
 ##############################################################################
@@ -1107,11 +1095,11 @@
11071095
 writeln -nonewline " "
11081096
 }
11091097
 writeln -nonewline "${s}_.c"; incr i
11101098
 }
11111099
 writeln "\n"
1112
-set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
1100
+set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
11131101
 writeln -nonewline "OBJ = "
11141102
 set i 0
11151103
 foreach s [lsort [concat $src $AdditionalObj]] {
11161104
 if {$i > 0} {
11171105
 writeln " \\"
@@ -1119,13 +1107,10 @@
11191107
 }
11201108
 writeln -nonewline "\$(OX)\\$s\$O"; incr i
11211109
 }
11221110
 writeln " \\"
11231111
 writeln -nonewline " \$(OX)\\fossil.res\n\n"
1124
-writeln "!ifdef FOSSIL_ENABLE_TCL"
1125
-writeln "OBJ = \$(OBJ) \$(OX)\\th_tcl\$O"
1126
-writeln "!endif"
11271112
 writeln {
11281113
 APPNAME = $(OX)\fossil$(E)
11291114
 PDBNAME = $(OX)\fossil$(P)
11301115
11311116
 all: $(OX) $(APPNAME)
@@ -1142,14 +1127,11 @@
11421127
 set redir {>}
11431128
 foreach s [lsort [concat $src $AdditionalObj]] {
11441129
 writeln "\techo \$(OX)\\$s.obj $redir \$@"
11451130
 set redir {>>}
11461131
 }
1147
-writeln "!ifdef FOSSIL_ENABLE_TCL"
1148
-writeln "\techo \$(OX)\\th_tcl.obj $redir \$@"
11491132
 set redir {>>}
1150
-writeln "!endif"
11511133
 writeln "\techo \$(LIBS) $redir \$@"
11521134
 writeln {
11531135
 $(OX):
11541136
 @-mkdir $@
11551137
@@ -1175,14 +1157,12 @@
11751157
 $(TCC) /Fo$@ -c $**
11761158
11771159
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
11781160
 $(TCC) /Fo$@ -c $**
11791161
1180
-!ifdef FOSSIL_ENABLE_TCL
11811162
 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
11821163
 $(TCC) /Fo$@ -c $**
1183
-!endif
11841164
11851165
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
11861166
 $** > $@
11871167
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
11881168
 $(TCC) /Fo$@ /c $**
11891169
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -268,23 +268,16 @@
268 # using -lsqlite3.
269 SQLITE3_OBJ.1 =
270 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
271 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
272
273 # The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
274 # If it is set to 1, then we need to build the Tcl integration code and
275 # link to the Tcl library.
276 TCL_OBJ.0 =
277 TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
278 TCL_OBJ. = $(TCL_OBJ.0)
279
280 EXTRAOBJ = \
281 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
282 $(OBJDIR)/shell.o \
283 $(OBJDIR)/th.o \
284 $(OBJDIR)/th_lang.o \
285 $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) \
286 $(OBJDIR)/cson_amalgamation.o
287
288 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
289 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
290
@@ -724,16 +717,13 @@
724 EXTRAOBJ = \
725 $(OBJDIR)/sqlite3.o \
726 $(OBJDIR)/shell.o \
727 $(OBJDIR)/th.o \
728 $(OBJDIR)/th_lang.o \
 
729 $(OBJDIR)/cson_amalgamation.o
730
731 ifdef FOSSIL_ENABLE_TCL
732 EXTRAOBJ += $(OBJDIR)/th_tcl.o
733 endif
734
735 zlib:
736 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
737
738 clean-zlib:
739 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
@@ -824,14 +814,12 @@
824 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
825
826 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
827 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
828
829 writeln {ifdef FOSSIL_ENABLE_TCL
830 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
831 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
832 endif}
833
834 close $output_file
835 #
836 # End of the win/Makefile.mingw output
837 ##############################################################################
@@ -1107,11 +1095,11 @@
1107 writeln -nonewline " "
1108 }
1109 writeln -nonewline "${s}_.c"; incr i
1110 }
1111 writeln "\n"
1112 set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
1113 writeln -nonewline "OBJ = "
1114 set i 0
1115 foreach s [lsort [concat $src $AdditionalObj]] {
1116 if {$i > 0} {
1117 writeln " \\"
@@ -1119,13 +1107,10 @@
1119 }
1120 writeln -nonewline "\$(OX)\\$s\$O"; incr i
1121 }
1122 writeln " \\"
1123 writeln -nonewline " \$(OX)\\fossil.res\n\n"
1124 writeln "!ifdef FOSSIL_ENABLE_TCL"
1125 writeln "OBJ = \$(OBJ) \$(OX)\\th_tcl\$O"
1126 writeln "!endif"
1127 writeln {
1128 APPNAME = $(OX)\fossil$(E)
1129 PDBNAME = $(OX)\fossil$(P)
1130
1131 all: $(OX) $(APPNAME)
@@ -1142,14 +1127,11 @@
1142 set redir {>}
1143 foreach s [lsort [concat $src $AdditionalObj]] {
1144 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1145 set redir {>>}
1146 }
1147 writeln "!ifdef FOSSIL_ENABLE_TCL"
1148 writeln "\techo \$(OX)\\th_tcl.obj $redir \$@"
1149 set redir {>>}
1150 writeln "!endif"
1151 writeln "\techo \$(LIBS) $redir \$@"
1152 writeln {
1153 $(OX):
1154 @-mkdir $@
1155
@@ -1175,14 +1157,12 @@
1175 $(TCC) /Fo$@ -c $**
1176
1177 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1178 $(TCC) /Fo$@ -c $**
1179
1180 !ifdef FOSSIL_ENABLE_TCL
1181 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
1182 $(TCC) /Fo$@ -c $**
1183 !endif
1184
1185 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1186 $** > $@
1187 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1188 $(TCC) /Fo$@ /c $**
1189
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -268,23 +268,16 @@
268 # using -lsqlite3.
269 SQLITE3_OBJ.1 =
270 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
271 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
272
 
 
 
 
 
 
 
273 EXTRAOBJ = \
274 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
275 $(OBJDIR)/shell.o \
276 $(OBJDIR)/th.o \
277 $(OBJDIR)/th_lang.o \
278 $(OBJDIR)/th_tcl.o \
279 $(OBJDIR)/cson_amalgamation.o
280
281 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
282 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
283
@@ -724,16 +717,13 @@
717 EXTRAOBJ = \
718 $(OBJDIR)/sqlite3.o \
719 $(OBJDIR)/shell.o \
720 $(OBJDIR)/th.o \
721 $(OBJDIR)/th_lang.o \
722 $(OBJDIR)/th_tcl.o \
723 $(OBJDIR)/cson_amalgamation.o
724
 
 
 
 
725 zlib:
726 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
727
728 clean-zlib:
729 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
@@ -824,14 +814,12 @@
814 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
815
816 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
817 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
818
819 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
820 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
 
 
821
822 close $output_file
823 #
824 # End of the win/Makefile.mingw output
825 ##############################################################################
@@ -1107,11 +1095,11 @@
1095 writeln -nonewline " "
1096 }
1097 writeln -nonewline "${s}_.c"; incr i
1098 }
1099 writeln "\n"
1100 set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1101 writeln -nonewline "OBJ = "
1102 set i 0
1103 foreach s [lsort [concat $src $AdditionalObj]] {
1104 if {$i > 0} {
1105 writeln " \\"
@@ -1119,13 +1107,10 @@
1107 }
1108 writeln -nonewline "\$(OX)\\$s\$O"; incr i
1109 }
1110 writeln " \\"
1111 writeln -nonewline " \$(OX)\\fossil.res\n\n"
 
 
 
1112 writeln {
1113 APPNAME = $(OX)\fossil$(E)
1114 PDBNAME = $(OX)\fossil$(P)
1115
1116 all: $(OX) $(APPNAME)
@@ -1142,14 +1127,11 @@
1127 set redir {>}
1128 foreach s [lsort [concat $src $AdditionalObj]] {
1129 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1130 set redir {>>}
1131 }
 
 
1132 set redir {>>}
 
1133 writeln "\techo \$(LIBS) $redir \$@"
1134 writeln {
1135 $(OX):
1136 @-mkdir $@
1137
@@ -1175,14 +1157,12 @@
1157 $(TCC) /Fo$@ -c $**
1158
1159 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1160 $(TCC) /Fo$@ -c $**
1161
 
1162 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
1163 $(TCC) /Fo$@ -c $**
 
1164
1165 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1166 $** > $@
1167 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1168 $(TCC) /Fo$@ /c $**
1169
M win/Makefile.mingw
+2 -7
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -669,15 +669,11 @@
669669
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670670
671671
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672672
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673673
674
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
675
-
676
-ifdef FOSSIL_ENABLE_TCL
677
-EXTRAOBJ += $(OBJDIR)/th_tcl.o
678
-endif
674
+EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
679675
680676
 zlib:
681677
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
682678
683679
 clean-zlib:
@@ -1745,9 +1741,8 @@
17451741
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17461742
17471743
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17481744
 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
17491745
1750
-ifdef FOSSIL_ENABLE_TCL
17511746
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
17521747
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1753
-endif
1748
+
17541749
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -669,15 +669,11 @@
669 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670
671 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673
674 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
675
676 ifdef FOSSIL_ENABLE_TCL
677 EXTRAOBJ += $(OBJDIR)/th_tcl.o
678 endif
679
680 zlib:
681 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
682
683 clean-zlib:
@@ -1745,9 +1741,8 @@
1745 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1746
1747 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1748 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1749
1750 ifdef FOSSIL_ENABLE_TCL
1751 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1752 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1753 endif
1754
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -669,15 +669,11 @@
669 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670
671 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673
674 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
 
 
 
 
675
676 zlib:
677 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
678
679 clean-zlib:
@@ -1745,9 +1741,8 @@
1741 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1742
1743 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1744 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1745
 
1746 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1747 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1748
1749
M win/Makefile.mingw.mistachkin
+1 -7
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -669,15 +669,11 @@
669669
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670670
671671
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672672
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673673
674
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
675
-
676
-ifdef FOSSIL_ENABLE_TCL
677
-EXTRAOBJ += $(OBJDIR)/th_tcl.o
678
-endif
674
+EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
679675
680676
 zlib:
681677
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
682678
683679
 clean-zlib:
@@ -1745,9 +1741,7 @@
17451741
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17461742
17471743
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17481744
 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
17491745
1750
-ifdef FOSSIL_ENABLE_TCL
17511746
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
17521747
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1753
-endif
17541748
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -669,15 +669,11 @@
669 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670
671 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673
674 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
675
676 ifdef FOSSIL_ENABLE_TCL
677 EXTRAOBJ += $(OBJDIR)/th_tcl.o
678 endif
679
680 zlib:
681 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
682
683 clean-zlib:
@@ -1745,9 +1741,7 @@
1745 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1746
1747 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1748 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1749
1750 ifdef FOSSIL_ENABLE_TCL
1751 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1752 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1753 endif
1754
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -669,15 +669,11 @@
669 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670
671 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673
674 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
 
 
 
 
675
676 zlib:
677 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
678
679 clean-zlib:
@@ -1745,9 +1741,7 @@
1741 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1742
1743 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1744 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1745
 
1746 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1747 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
 
1748
M win/Makefile.msc
+2 -8
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -310,10 +310,11 @@
310310
 $(OX)\tag$O \
311311
 $(OX)\tar$O \
312312
 $(OX)\th$O \
313313
 $(OX)\th_lang$O \
314314
 $(OX)\th_main$O \
315
+ $(OX)\th_tcl$O \
315316
 $(OX)\timeline$O \
316317
 $(OX)\tkt$O \
317318
 $(OX)\tktsetup$O \
318319
 $(OX)\undo$O \
319320
 $(OX)\unicode$O \
@@ -332,13 +333,10 @@
332333
 $(OX)\xfer$O \
333334
 $(OX)\xfersetup$O \
334335
 $(OX)\zip$O \
335336
 $(OX)\fossil.res
336337
337
-!ifdef FOSSIL_ENABLE_TCL
338
-OBJ = $(OBJ) $(OX)\th_tcl$O
339
-!endif
340338
341339
 APPNAME = $(OX)\fossil$(E)
342340
 PDBNAME = $(OX)\fossil$(P)
343341
344342
 all: $(OX) $(APPNAME)
@@ -444,10 +442,11 @@
444442
 echo $(OX)\tag.obj >> $@
445443
 echo $(OX)\tar.obj >> $@
446444
 echo $(OX)\th.obj >> $@
447445
 echo $(OX)\th_lang.obj >> $@
448446
 echo $(OX)\th_main.obj >> $@
447
+ echo $(OX)\th_tcl.obj >> $@
449448
 echo $(OX)\timeline.obj >> $@
450449
 echo $(OX)\tkt.obj >> $@
451450
 echo $(OX)\tktsetup.obj >> $@
452451
 echo $(OX)\undo.obj >> $@
453452
 echo $(OX)\unicode.obj >> $@
@@ -464,13 +463,10 @@
464463
 echo $(OX)\winhttp.obj >> $@
465464
 echo $(OX)\wysiwyg.obj >> $@
466465
 echo $(OX)\xfer.obj >> $@
467466
 echo $(OX)\xfersetup.obj >> $@
468467
 echo $(OX)\zip.obj >> $@
469
-!ifdef FOSSIL_ENABLE_TCL
470
- echo $(OX)\th_tcl.obj >> $@
471
-!endif
472468
 echo $(LIBS) >> $@
473469
474470
 $(OX):
475471
 @-mkdir $@
476472
@@ -496,14 +492,12 @@
496492
 $(TCC) /Fo$@ -c $**
497493
498494
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
499495
 $(TCC) /Fo$@ -c $**
500496
501
-!ifdef FOSSIL_ENABLE_TCL
502497
 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
503498
 $(TCC) /Fo$@ -c $**
504
-!endif
505499
506500
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
507501
 $** > $@
508502
 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
509503
 $(TCC) /Fo$@ /c $**
510504
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -310,10 +310,11 @@
310 $(OX)\tag$O \
311 $(OX)\tar$O \
312 $(OX)\th$O \
313 $(OX)\th_lang$O \
314 $(OX)\th_main$O \
 
315 $(OX)\timeline$O \
316 $(OX)\tkt$O \
317 $(OX)\tktsetup$O \
318 $(OX)\undo$O \
319 $(OX)\unicode$O \
@@ -332,13 +333,10 @@
332 $(OX)\xfer$O \
333 $(OX)\xfersetup$O \
334 $(OX)\zip$O \
335 $(OX)\fossil.res
336
337 !ifdef FOSSIL_ENABLE_TCL
338 OBJ = $(OBJ) $(OX)\th_tcl$O
339 !endif
340
341 APPNAME = $(OX)\fossil$(E)
342 PDBNAME = $(OX)\fossil$(P)
343
344 all: $(OX) $(APPNAME)
@@ -444,10 +442,11 @@
444 echo $(OX)\tag.obj >> $@
445 echo $(OX)\tar.obj >> $@
446 echo $(OX)\th.obj >> $@
447 echo $(OX)\th_lang.obj >> $@
448 echo $(OX)\th_main.obj >> $@
 
449 echo $(OX)\timeline.obj >> $@
450 echo $(OX)\tkt.obj >> $@
451 echo $(OX)\tktsetup.obj >> $@
452 echo $(OX)\undo.obj >> $@
453 echo $(OX)\unicode.obj >> $@
@@ -464,13 +463,10 @@
464 echo $(OX)\winhttp.obj >> $@
465 echo $(OX)\wysiwyg.obj >> $@
466 echo $(OX)\xfer.obj >> $@
467 echo $(OX)\xfersetup.obj >> $@
468 echo $(OX)\zip.obj >> $@
469 !ifdef FOSSIL_ENABLE_TCL
470 echo $(OX)\th_tcl.obj >> $@
471 !endif
472 echo $(LIBS) >> $@
473
474 $(OX):
475 @-mkdir $@
476
@@ -496,14 +492,12 @@
496 $(TCC) /Fo$@ -c $**
497
498 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
499 $(TCC) /Fo$@ -c $**
500
501 !ifdef FOSSIL_ENABLE_TCL
502 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
503 $(TCC) /Fo$@ -c $**
504 !endif
505
506 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
507 $** > $@
508 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
509 $(TCC) /Fo$@ /c $**
510
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -310,10 +310,11 @@
310 $(OX)\tag$O \
311 $(OX)\tar$O \
312 $(OX)\th$O \
313 $(OX)\th_lang$O \
314 $(OX)\th_main$O \
315 $(OX)\th_tcl$O \
316 $(OX)\timeline$O \
317 $(OX)\tkt$O \
318 $(OX)\tktsetup$O \
319 $(OX)\undo$O \
320 $(OX)\unicode$O \
@@ -332,13 +333,10 @@
333 $(OX)\xfer$O \
334 $(OX)\xfersetup$O \
335 $(OX)\zip$O \
336 $(OX)\fossil.res
337
 
 
 
338
339 APPNAME = $(OX)\fossil$(E)
340 PDBNAME = $(OX)\fossil$(P)
341
342 all: $(OX) $(APPNAME)
@@ -444,10 +442,11 @@
442 echo $(OX)\tag.obj >> $@
443 echo $(OX)\tar.obj >> $@
444 echo $(OX)\th.obj >> $@
445 echo $(OX)\th_lang.obj >> $@
446 echo $(OX)\th_main.obj >> $@
447 echo $(OX)\th_tcl.obj >> $@
448 echo $(OX)\timeline.obj >> $@
449 echo $(OX)\tkt.obj >> $@
450 echo $(OX)\tktsetup.obj >> $@
451 echo $(OX)\undo.obj >> $@
452 echo $(OX)\unicode.obj >> $@
@@ -464,13 +463,10 @@
463 echo $(OX)\winhttp.obj >> $@
464 echo $(OX)\wysiwyg.obj >> $@
465 echo $(OX)\xfer.obj >> $@
466 echo $(OX)\xfersetup.obj >> $@
467 echo $(OX)\zip.obj >> $@
 
 
 
468 echo $(LIBS) >> $@
469
470 $(OX):
471 @-mkdir $@
472
@@ -496,14 +492,12 @@
492 $(TCC) /Fo$@ -c $**
493
494 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
495 $(TCC) /Fo$@ -c $**
496
 
497 $(OX)\th_tcl$O : $(SRCDIR)\th_tcl.c
498 $(TCC) /Fo$@ -c $**
 
499
500 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
501 $** > $@
502 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
503 $(TCC) /Fo$@ /c $**
504

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button