Fossil SCM

Sync up the 'makemake.tcl' tool.

mistachkin 2016-01-16 21:36 UTC mingwConfigure
Commit 2c7eee4c9a5550b3e87ca97123be692964dd1936
Parent c76ea6b4ec49874…
2 files changed +1 +12 -2
~ src/main.mk ~ src/makemake.tcl
M src/main.mk
+1
--- src/main.mk
+++ src/main.mk
@@ -517,10 +517,11 @@
517517
 LINENOISE_DEF.1 = -DHAVE_LINENOISE
518518
 LINENOISE_DEF. = $(LINENOISE_DEF.0)
519519
 LINENOISE_OBJ.0 =
520520
 LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
521521
 LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
522
+
522523
523524
 EXTRAOBJ = \
524525
 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
525526
 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
526527
 $(LINENOISE_OBJ.$(USE_LINENOISE)) \
527528
--- src/main.mk
+++ src/main.mk
@@ -517,10 +517,11 @@
517 LINENOISE_DEF.1 = -DHAVE_LINENOISE
518 LINENOISE_DEF. = $(LINENOISE_DEF.0)
519 LINENOISE_OBJ.0 =
520 LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
521 LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
 
522
523 EXTRAOBJ = \
524 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
525 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
526 $(LINENOISE_OBJ.$(USE_LINENOISE)) \
527
--- src/main.mk
+++ src/main.mk
@@ -517,10 +517,11 @@
517 LINENOISE_DEF.1 = -DHAVE_LINENOISE
518 LINENOISE_DEF. = $(LINENOISE_DEF.0)
519 LINENOISE_OBJ.0 =
520 LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
521 LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
522
523
524 EXTRAOBJ = \
525 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
526 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
527 $(LINENOISE_OBJ.$(USE_LINENOISE)) \
528
M src/makemake.tcl
+12 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -337,17 +337,27 @@
337337
 # set to 1. If it is set to 1, the miniz library included in the
338338
 # source tree should be used; otherwise, it should not.
339339
 MINIZ_OBJ.0 =
340340
 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
341341
 MINIZ_OBJ. = $(MINIZ_OBJ.0)
342
+
343
+# The USE_LINENOISE variable may be undefined, set to 0, or set
344
+# to 1. If it is set to 0, then there is no need to build or link
345
+# the linenoise.o object.
346
+LINENOISE_DEF.0 =
347
+LINENOISE_DEF.1 = -DHAVE_LINENOISE
348
+LINENOISE_DEF. = $(LINENOISE_DEF.0)
349
+LINENOISE_OBJ.0 =
350
+LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
351
+LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
342352
 }]
343353
344354
 writeln [string map [list <<<NEXT_LINE>>> \\] {
345355
 EXTRAOBJ = <<<NEXT_LINE>>>
346356
 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) <<<NEXT_LINE>>>
347357
 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) <<<NEXT_LINE>>>
348
- $(OBJDIR)/linenoise.o <<<NEXT_LINE>>>
358
+ $(LINENOISE_OBJ.$(USE_LINENOISE)) <<<NEXT_LINE>>>
349359
 $(OBJDIR)/shell.o <<<NEXT_LINE>>>
350360
 $(OBJDIR)/th.o <<<NEXT_LINE>>>
351361
 $(OBJDIR)/th_lang.o <<<NEXT_LINE>>>
352362
 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
353363
 $(OBJDIR)/cson_amalgamation.o
@@ -404,11 +414,11 @@
404414
405415
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
406416
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$@\n"
407417
408418
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
409
-writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -DHAVE_LINENOISE -c \$(SRCDIR)/shell.c -o \$@\n"
419
+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SRCDIR)/shell.c -o \$@\n"
410420
411421
 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
412422
 writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
413423
414424
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
415425
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -337,17 +337,27 @@
337 # set to 1. If it is set to 1, the miniz library included in the
338 # source tree should be used; otherwise, it should not.
339 MINIZ_OBJ.0 =
340 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
341 MINIZ_OBJ. = $(MINIZ_OBJ.0)
 
 
 
 
 
 
 
 
 
 
342 }]
343
344 writeln [string map [list <<<NEXT_LINE>>> \\] {
345 EXTRAOBJ = <<<NEXT_LINE>>>
346 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) <<<NEXT_LINE>>>
347 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) <<<NEXT_LINE>>>
348 $(OBJDIR)/linenoise.o <<<NEXT_LINE>>>
349 $(OBJDIR)/shell.o <<<NEXT_LINE>>>
350 $(OBJDIR)/th.o <<<NEXT_LINE>>>
351 $(OBJDIR)/th_lang.o <<<NEXT_LINE>>>
352 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
353 $(OBJDIR)/cson_amalgamation.o
@@ -404,11 +414,11 @@
404
405 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
406 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$@\n"
407
408 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
409 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -DHAVE_LINENOISE -c \$(SRCDIR)/shell.c -o \$@\n"
410
411 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
412 writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
413
414 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
415
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -337,17 +337,27 @@
337 # set to 1. If it is set to 1, the miniz library included in the
338 # source tree should be used; otherwise, it should not.
339 MINIZ_OBJ.0 =
340 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
341 MINIZ_OBJ. = $(MINIZ_OBJ.0)
342
343 # The USE_LINENOISE variable may be undefined, set to 0, or set
344 # to 1. If it is set to 0, then there is no need to build or link
345 # the linenoise.o object.
346 LINENOISE_DEF.0 =
347 LINENOISE_DEF.1 = -DHAVE_LINENOISE
348 LINENOISE_DEF. = $(LINENOISE_DEF.0)
349 LINENOISE_OBJ.0 =
350 LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
351 LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
352 }]
353
354 writeln [string map [list <<<NEXT_LINE>>> \\] {
355 EXTRAOBJ = <<<NEXT_LINE>>>
356 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) <<<NEXT_LINE>>>
357 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) <<<NEXT_LINE>>>
358 $(LINENOISE_OBJ.$(USE_LINENOISE)) <<<NEXT_LINE>>>
359 $(OBJDIR)/shell.o <<<NEXT_LINE>>>
360 $(OBJDIR)/th.o <<<NEXT_LINE>>>
361 $(OBJDIR)/th_lang.o <<<NEXT_LINE>>>
362 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
363 $(OBJDIR)/cson_amalgamation.o
@@ -404,11 +414,11 @@
414
415 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
416 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$@\n"
417
418 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
419 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SRCDIR)/shell.c -o \$@\n"
420
421 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
422 writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
423
424 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
425

Keyboard Shortcuts

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