Fossil SCM
Update the makemake.tcl script to match the checked-in versions of the generated makefiles.
Commit
3e83c6a924b0f235fc88e650769641bfbc75a0148f049b2098cfaa948e1e3a47
Parent
cbfaec5875c3c27…
1 file changed
+8
-8
+8
-8
| --- tools/makemake.tcl | ||
| +++ tools/makemake.tcl | ||
| @@ -556,24 +556,24 @@ | ||
| 556 | 556 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n" |
| 557 | 557 | |
| 558 | 558 | writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c" |
| 559 | 559 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n" |
| 560 | 560 | |
| 561 | -writeln { | |
| 561 | +writeln [string map [list <<<NEXT_LINE>>> \\] { | |
| 562 | 562 | $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c |
| 563 | 563 | $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@ |
| 564 | 564 | |
| 565 | 565 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c |
| 566 | 566 | $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@ |
| 567 | 567 | |
| 568 | 568 | $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c |
| 569 | - $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \ | |
| 570 | - -sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackRestore \ | |
| 571 | - -sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c \ | |
| 572 | - -sENVIRONMENT=web \ | |
| 573 | - -sMODULARIZE \ | |
| 574 | - -sEXPORT_NAME=initPikchrModule \ | |
| 569 | + $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>> | |
| 570 | + -sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackRestore <<<NEXT_LINE>>> | |
| 571 | + -sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c <<<NEXT_LINE>>> | |
| 572 | + -sENVIRONMENT=web <<<NEXT_LINE>>> | |
| 573 | + -sMODULARIZE <<<NEXT_LINE>>> | |
| 574 | + -sEXPORT_NAME=initPikchrModule <<<NEXT_LINE>>> | |
| 575 | 575 | --minify 0 |
| 576 | 576 | @chmod -x $(SRCDIR_extsrc)/pikchr.wasm |
| 577 | 577 | wasm: $(SRCDIR_extsrc)/pikchr.js |
| 578 | 578 | |
| 579 | 579 | # |
| @@ -580,11 +580,11 @@ | ||
| 580 | 580 | # The list of all the targets that do not correspond to real files. This stops |
| 581 | 581 | # 'make' from getting confused when someone makes an error in a rule. |
| 582 | 582 | # |
| 583 | 583 | |
| 584 | 584 | .PHONY: all install test clean |
| 585 | -} | |
| 585 | +}] | |
| 586 | 586 | |
| 587 | 587 | close $output_file |
| 588 | 588 | # |
| 589 | 589 | # End of the main.mk output |
| 590 | 590 | ############################################################################## |
| 591 | 591 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -556,24 +556,24 @@ | |
| 556 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n" |
| 557 | |
| 558 | writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c" |
| 559 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n" |
| 560 | |
| 561 | writeln { |
| 562 | $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c |
| 563 | $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@ |
| 564 | |
| 565 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c |
| 566 | $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@ |
| 567 | |
| 568 | $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c |
| 569 | $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \ |
| 570 | -sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackRestore \ |
| 571 | -sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c \ |
| 572 | -sENVIRONMENT=web \ |
| 573 | -sMODULARIZE \ |
| 574 | -sEXPORT_NAME=initPikchrModule \ |
| 575 | --minify 0 |
| 576 | @chmod -x $(SRCDIR_extsrc)/pikchr.wasm |
| 577 | wasm: $(SRCDIR_extsrc)/pikchr.js |
| 578 | |
| 579 | # |
| @@ -580,11 +580,11 @@ | |
| 580 | # The list of all the targets that do not correspond to real files. This stops |
| 581 | # 'make' from getting confused when someone makes an error in a rule. |
| 582 | # |
| 583 | |
| 584 | .PHONY: all install test clean |
| 585 | } |
| 586 | |
| 587 | close $output_file |
| 588 | # |
| 589 | # End of the main.mk output |
| 590 | ############################################################################## |
| 591 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -556,24 +556,24 @@ | |
| 556 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n" |
| 557 | |
| 558 | writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c" |
| 559 | writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n" |
| 560 | |
| 561 | writeln [string map [list <<<NEXT_LINE>>> \\] { |
| 562 | $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c |
| 563 | $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@ |
| 564 | |
| 565 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c |
| 566 | $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@ |
| 567 | |
| 568 | $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c |
| 569 | $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>> |
| 570 | -sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackRestore <<<NEXT_LINE>>> |
| 571 | -sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c <<<NEXT_LINE>>> |
| 572 | -sENVIRONMENT=web <<<NEXT_LINE>>> |
| 573 | -sMODULARIZE <<<NEXT_LINE>>> |
| 574 | -sEXPORT_NAME=initPikchrModule <<<NEXT_LINE>>> |
| 575 | --minify 0 |
| 576 | @chmod -x $(SRCDIR_extsrc)/pikchr.wasm |
| 577 | wasm: $(SRCDIR_extsrc)/pikchr.js |
| 578 | |
| 579 | # |
| @@ -580,11 +580,11 @@ | |
| 580 | # The list of all the targets that do not correspond to real files. This stops |
| 581 | # 'make' from getting confused when someone makes an error in a rule. |
| 582 | # |
| 583 | |
| 584 | .PHONY: all install test clean |
| 585 | }] |
| 586 | |
| 587 | close $output_file |
| 588 | # |
| 589 | # End of the main.mk output |
| 590 | ############################################################################## |
| 591 |