Fossil SCM

Update the unix makefile to correct a dependency problem discovered by --shuffle=reverse in Gnu make.

drh 2025-05-14 13:20 trunk merge
Commit ae137399cb4a3cf1219b1498fa841df8ea99b87e0850e3f1b76a2f5736a2055f
Parent 04b9b0136daec1b…
2 files changed +15 -7 +12 -7
~ src/main.mk ~ tools/makemake.tcl
M src/main.mk
+15 -7
--- src/main.mk
+++ src/main.mk
@@ -578,39 +578,41 @@
578578
 $(OBJDIR)/winfile.o \
579579
 $(OBJDIR)/winhttp.o \
580580
 $(OBJDIR)/xfer.o \
581581
 $(OBJDIR)/xfersetup.o \
582582
 $(OBJDIR)/zip.o
583
-all: $(OBJDIR) $(APPNAME)
583
+all: $(APPNAME)
584584
585585
 install: all
586586
 mkdir -p $(INSTALLDIR)
587587
 cp $(APPNAME) $(INSTALLDIR)
588588
589589
 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
590590
 $(OBJDIR)/codecheck1 $(TRANS_SRC)
591591
592
-$(OBJDIR):
593
- -mkdir $(OBJDIR)
594
-
595592
 $(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
596593
 -mkdir -p $(OBJDIR)
597594
 $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
598595
599596
 $(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
597
+ -mkdir -p $(OBJDIR)
600598
 $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
601599
602600
 $(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
601
+ -mkdir -p $(OBJDIR)
603602
 $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
604603
605604
 $(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
605
+ -mkdir -p $(OBJDIR)
606606
 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
607607
608608
 $(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
609
+ -mkdir -p $(OBJDIR)
609610
 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
610611
611612
 $(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
613
+ -mkdir -p $(OBJDIR)
612614
 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
613615
614616
 # Run the test suite.
615617
 # Other flags that can be included in TESTFLAGS are:
616618
 #
@@ -622,11 +624,11 @@
622624
 # -strict Treat known bugs as failures
623625
 #
624626
 # TESTFLAGS can also include names of specific test files to limit
625627
 # the run to just those test cases.
626628
 #
627
-test: $(OBJDIR) $(APPNAME)
629
+test: $(APPNAME)
628630
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
629631
630632
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
631633
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
632634
 $(SRCDIR)/../manifest \
@@ -2119,23 +2121,29 @@
21192121
21202122
 $(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
21212123
 $(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
21222124
21232125
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2126
+ -mkdir -p $(OBJDIR)
2127
+
21242128
 $(XTCC) -c $(SRCDIR)/th.c -o $@
21252129
21262130
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2131
+ -mkdir -p $(OBJDIR)
2132
+
21272133
 $(XTCC) -c $(SRCDIR)/th_lang.c -o $@
21282134
21292135
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2136
+ -mkdir -p $(OBJDIR)
2137
+
21302138
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
21312139
21322140
2133
-$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2141
+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
21342142
 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
21352143
2136
-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2144
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
21372145
 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
21382146
21392147
 $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
21402148
 $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
21412149
 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
21422150
--- src/main.mk
+++ src/main.mk
@@ -578,39 +578,41 @@
578 $(OBJDIR)/winfile.o \
579 $(OBJDIR)/winhttp.o \
580 $(OBJDIR)/xfer.o \
581 $(OBJDIR)/xfersetup.o \
582 $(OBJDIR)/zip.o
583 all: $(OBJDIR) $(APPNAME)
584
585 install: all
586 mkdir -p $(INSTALLDIR)
587 cp $(APPNAME) $(INSTALLDIR)
588
589 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
590 $(OBJDIR)/codecheck1 $(TRANS_SRC)
591
592 $(OBJDIR):
593 -mkdir $(OBJDIR)
594
595 $(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
596 -mkdir -p $(OBJDIR)
597 $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
598
599 $(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
 
600 $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
601
602 $(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
 
603 $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
604
605 $(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
 
606 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
607
608 $(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
 
609 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
610
611 $(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
 
612 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
613
614 # Run the test suite.
615 # Other flags that can be included in TESTFLAGS are:
616 #
@@ -622,11 +624,11 @@
622 # -strict Treat known bugs as failures
623 #
624 # TESTFLAGS can also include names of specific test files to limit
625 # the run to just those test cases.
626 #
627 test: $(OBJDIR) $(APPNAME)
628 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
629
630 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
631 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
632 $(SRCDIR)/../manifest \
@@ -2119,23 +2121,29 @@
2119
2120 $(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
2121 $(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2122
2123 $(OBJDIR)/th.o: $(SRCDIR)/th.c
 
 
2124 $(XTCC) -c $(SRCDIR)/th.c -o $@
2125
2126 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
 
 
2127 $(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2128
2129 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
 
 
2130 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2131
2132
2133 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2134 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2135
2136 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2137 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2138
2139 $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2140 $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2141 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
2142
--- src/main.mk
+++ src/main.mk
@@ -578,39 +578,41 @@
578 $(OBJDIR)/winfile.o \
579 $(OBJDIR)/winhttp.o \
580 $(OBJDIR)/xfer.o \
581 $(OBJDIR)/xfersetup.o \
582 $(OBJDIR)/zip.o
583 all: $(APPNAME)
584
585 install: all
586 mkdir -p $(INSTALLDIR)
587 cp $(APPNAME) $(INSTALLDIR)
588
589 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
590 $(OBJDIR)/codecheck1 $(TRANS_SRC)
591
 
 
 
592 $(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
593 -mkdir -p $(OBJDIR)
594 $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
595
596 $(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
597 -mkdir -p $(OBJDIR)
598 $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
599
600 $(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
601 -mkdir -p $(OBJDIR)
602 $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
603
604 $(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
605 -mkdir -p $(OBJDIR)
606 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
607
608 $(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
609 -mkdir -p $(OBJDIR)
610 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
611
612 $(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
613 -mkdir -p $(OBJDIR)
614 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
615
616 # Run the test suite.
617 # Other flags that can be included in TESTFLAGS are:
618 #
@@ -622,11 +624,11 @@
624 # -strict Treat known bugs as failures
625 #
626 # TESTFLAGS can also include names of specific test files to limit
627 # the run to just those test cases.
628 #
629 test: $(APPNAME)
630 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
631
632 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
633 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
634 $(SRCDIR)/../manifest \
@@ -2119,23 +2121,29 @@
2121
2122 $(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
2123 $(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2124
2125 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2126 -mkdir -p $(OBJDIR)
2127
2128 $(XTCC) -c $(SRCDIR)/th.c -o $@
2129
2130 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2131 -mkdir -p $(OBJDIR)
2132
2133 $(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2134
2135 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2136 -mkdir -p $(OBJDIR)
2137
2138 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2139
2140
2141 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
2142 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2143
2144 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
2145 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2146
2147 $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2148 $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2149 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
2150
M tools/makemake.tcl
+12 -7
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -368,39 +368,41 @@
368368
 writeln [string map [list \
369369
 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
370370
 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
371371
 <<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
372372
 <<<NEXT_LINE>>> \\] {
373
-all: $(OBJDIR) $(APPNAME)
373
+all: $(APPNAME)
374374
375375
 install: all
376376
 mkdir -p $(INSTALLDIR)
377377
 cp $(APPNAME) $(INSTALLDIR)
378378
379379
 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
380380
 $(OBJDIR)/codecheck1 $(TRANS_SRC)
381381
382
-$(OBJDIR):
383
- -mkdir $(OBJDIR)
384
-
385382
 $(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
386383
 -mkdir -p $(OBJDIR)
387384
 $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
388385
389386
 $(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
387
+ -mkdir -p $(OBJDIR)
390388
 $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
391389
392390
 $(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
391
+ -mkdir -p $(OBJDIR)
393392
 $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
394393
395394
 $(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
395
+ -mkdir -p $(OBJDIR)
396396
 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
397397
398398
 $(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
399
+ -mkdir -p $(OBJDIR)
399400
 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
400401
401402
 $(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
403
+ -mkdir -p $(OBJDIR)
402404
 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
403405
404406
 # Run the test suite.
405407
 # Other flags that can be included in TESTFLAGS are:
406408
 #
@@ -412,11 +414,11 @@
412414
 # -strict Treat known bugs as failures
413415
 #
414416
 # TESTFLAGS can also include names of specific test files to limit
415417
 # the run to just those test cases.
416418
 #
417
-test: $(OBJDIR) $(APPNAME)
419
+test: $(APPNAME)
418420
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
419421
420422
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
421423
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
422424
 $(SRCDIR)/../manifest <<<NEXT_LINE>>>
@@ -552,23 +554,26 @@
552554
553555
 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
554556
 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
555557
556558
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
559
+writeln "\t-mkdir -p \$(OBJDIR)\n"
557560
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
558561
559562
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
563
+writeln "\t-mkdir -p \$(OBJDIR)\n"
560564
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
561565
562566
 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
567
+writeln "\t-mkdir -p \$(OBJDIR)\n"
563568
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
564569
565570
 writeln [string map [list <<<NEXT_LINE>>> \\] {
566
-$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
571
+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
567572
 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568573
569
-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
574
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
570575
 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571576
572577
 $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
573578
 $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574579
 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
575580
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -368,39 +368,41 @@
368 writeln [string map [list \
369 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
370 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
371 <<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
372 <<<NEXT_LINE>>> \\] {
373 all: $(OBJDIR) $(APPNAME)
374
375 install: all
376 mkdir -p $(INSTALLDIR)
377 cp $(APPNAME) $(INSTALLDIR)
378
379 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
380 $(OBJDIR)/codecheck1 $(TRANS_SRC)
381
382 $(OBJDIR):
383 -mkdir $(OBJDIR)
384
385 $(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
386 -mkdir -p $(OBJDIR)
387 $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
388
389 $(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
 
390 $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
391
392 $(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
 
393 $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
394
395 $(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
 
396 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
397
398 $(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
 
399 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
400
401 $(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
 
402 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
403
404 # Run the test suite.
405 # Other flags that can be included in TESTFLAGS are:
406 #
@@ -412,11 +414,11 @@
412 # -strict Treat known bugs as failures
413 #
414 # TESTFLAGS can also include names of specific test files to limit
415 # the run to just those test cases.
416 #
417 test: $(OBJDIR) $(APPNAME)
418 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
419
420 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
421 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
422 $(SRCDIR)/../manifest <<<NEXT_LINE>>>
@@ -552,23 +554,26 @@
552
553 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
554 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
555
556 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
 
557 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
558
559 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
 
560 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
561
562 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
 
563 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
564
565 writeln [string map [list <<<NEXT_LINE>>> \\] {
566 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
567 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568
569 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
570 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571
572 $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
573 $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
575
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -368,39 +368,41 @@
368 writeln [string map [list \
369 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
370 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
371 <<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
372 <<<NEXT_LINE>>> \\] {
373 all: $(APPNAME)
374
375 install: all
376 mkdir -p $(INSTALLDIR)
377 cp $(APPNAME) $(INSTALLDIR)
378
379 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
380 $(OBJDIR)/codecheck1 $(TRANS_SRC)
381
 
 
 
382 $(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
383 -mkdir -p $(OBJDIR)
384 $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
385
386 $(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
387 -mkdir -p $(OBJDIR)
388 $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
389
390 $(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
391 -mkdir -p $(OBJDIR)
392 $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
393
394 $(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
395 -mkdir -p $(OBJDIR)
396 $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
397
398 $(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
399 -mkdir -p $(OBJDIR)
400 $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
401
402 $(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
403 -mkdir -p $(OBJDIR)
404 $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
405
406 # Run the test suite.
407 # Other flags that can be included in TESTFLAGS are:
408 #
@@ -412,11 +414,11 @@
414 # -strict Treat known bugs as failures
415 #
416 # TESTFLAGS can also include names of specific test files to limit
417 # the run to just those test cases.
418 #
419 test: $(APPNAME)
420 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
421
422 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
423 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
424 $(SRCDIR)/../manifest <<<NEXT_LINE>>>
@@ -552,23 +554,26 @@
554
555 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
556 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
557
558 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
559 writeln "\t-mkdir -p \$(OBJDIR)\n"
560 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
561
562 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
563 writeln "\t-mkdir -p \$(OBJDIR)\n"
564 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
565
566 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
567 writeln "\t-mkdir -p \$(OBJDIR)\n"
568 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
569
570 writeln [string map [list <<<NEXT_LINE>>> \\] {
571 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
572 $(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
573
574 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
575 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
576
577 $(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
578 $(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
579 -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
580

Keyboard Shortcuts

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