Fossil SCM
Update the custom MinGW makefile.
Commit
d425ea6b4c02640975336536ce61d5bf605376f1eeb155ce6e97485e17ef792a
Parent
9fef4e01ba474d5…
1 file changed
+38
-33
+38
-33
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -166,15 +166,12 @@ | ||
| 166 | 166 | ifndef FOSSIL_ENABLE_MINIZ |
| 167 | 167 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 168 | 168 | endif |
| 169 | 169 | |
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | -# The recommended usage here is to use the Sysinternals junction tool | |
| 172 | -# to create a hard link between an "openssl-1.x" sub-directory of the | |
| 173 | -# Fossil source code directory and the target OpenSSL source directory. | |
| 174 | 171 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g | |
| 172 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl | |
| 176 | 173 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 174 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 175 | |
| 179 | 176 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 177 | # source code directory resides (depending on the value of the macro |
| @@ -444,14 +441,16 @@ | ||
| 444 | 441 | $(SRCDIR)/bundle.c \ |
| 445 | 442 | $(SRCDIR)/cache.c \ |
| 446 | 443 | $(SRCDIR)/capabilities.c \ |
| 447 | 444 | $(SRCDIR)/captcha.c \ |
| 448 | 445 | $(SRCDIR)/cgi.c \ |
| 446 | + $(SRCDIR)/chat.c \ | |
| 449 | 447 | $(SRCDIR)/checkin.c \ |
| 450 | 448 | $(SRCDIR)/checkout.c \ |
| 451 | 449 | $(SRCDIR)/clearsign.c \ |
| 452 | 450 | $(SRCDIR)/clone.c \ |
| 451 | + $(SRCDIR)/color.c \ | |
| 453 | 452 | $(SRCDIR)/comformat.c \ |
| 454 | 453 | $(SRCDIR)/configure.c \ |
| 455 | 454 | $(SRCDIR)/content.c \ |
| 456 | 455 | $(SRCDIR)/cookies.c \ |
| 457 | 456 | $(SRCDIR)/db.c \ |
| @@ -564,21 +563,19 @@ | ||
| 564 | 563 | $(SRCDIR)/user.c \ |
| 565 | 564 | $(SRCDIR)/utf8.c \ |
| 566 | 565 | $(SRCDIR)/util.c \ |
| 567 | 566 | $(SRCDIR)/verify.c \ |
| 568 | 567 | $(SRCDIR)/vfile.c \ |
| 569 | - $(SRCDIR)/webmail.c \ | |
| 570 | 568 | $(SRCDIR)/wiki.c \ |
| 571 | 569 | $(SRCDIR)/wikiformat.c \ |
| 572 | 570 | $(SRCDIR)/winfile.c \ |
| 573 | 571 | $(SRCDIR)/winhttp.c \ |
| 574 | 572 | $(SRCDIR)/xfer.c \ |
| 575 | 573 | $(SRCDIR)/xfersetup.c \ |
| 576 | 574 | $(SRCDIR)/zip.c |
| 577 | 575 | |
| 578 | 576 | EXTRA_FILES = \ |
| 579 | - $(SRCDIR)/../skins/aht/details.txt \ | |
| 580 | 577 | $(SRCDIR)/../skins/ardoise/css.txt \ |
| 581 | 578 | $(SRCDIR)/../skins/ardoise/details.txt \ |
| 582 | 579 | $(SRCDIR)/../skins/ardoise/footer.txt \ |
| 583 | 580 | $(SRCDIR)/../skins/ardoise/header.txt \ |
| 584 | 581 | $(SRCDIR)/../skins/black_and_white/css.txt \ |
| @@ -588,32 +585,26 @@ | ||
| 588 | 585 | $(SRCDIR)/../skins/blitz/css.txt \ |
| 589 | 586 | $(SRCDIR)/../skins/blitz/details.txt \ |
| 590 | 587 | $(SRCDIR)/../skins/blitz/footer.txt \ |
| 591 | 588 | $(SRCDIR)/../skins/blitz/header.txt \ |
| 592 | 589 | $(SRCDIR)/../skins/blitz/ticket.txt \ |
| 593 | - $(SRCDIR)/../skins/blitz_no_logo/css.txt \ | |
| 594 | - $(SRCDIR)/../skins/blitz_no_logo/details.txt \ | |
| 595 | - $(SRCDIR)/../skins/blitz_no_logo/footer.txt \ | |
| 596 | - $(SRCDIR)/../skins/blitz_no_logo/header.txt \ | |
| 597 | - $(SRCDIR)/../skins/blitz_no_logo/ticket.txt \ | |
| 598 | 590 | $(SRCDIR)/../skins/bootstrap/css.txt \ |
| 599 | 591 | $(SRCDIR)/../skins/bootstrap/details.txt \ |
| 600 | 592 | $(SRCDIR)/../skins/bootstrap/footer.txt \ |
| 601 | 593 | $(SRCDIR)/../skins/bootstrap/header.txt \ |
| 594 | + $(SRCDIR)/../skins/darkmode/css.txt \ | |
| 595 | + $(SRCDIR)/../skins/darkmode/details.txt \ | |
| 596 | + $(SRCDIR)/../skins/darkmode/footer.txt \ | |
| 597 | + $(SRCDIR)/../skins/darkmode/header.txt \ | |
| 602 | 598 | $(SRCDIR)/../skins/default/css.txt \ |
| 603 | 599 | $(SRCDIR)/../skins/default/details.txt \ |
| 604 | 600 | $(SRCDIR)/../skins/default/footer.txt \ |
| 605 | 601 | $(SRCDIR)/../skins/default/header.txt \ |
| 606 | - $(SRCDIR)/../skins/default/js.txt \ | |
| 607 | 602 | $(SRCDIR)/../skins/eagle/css.txt \ |
| 608 | 603 | $(SRCDIR)/../skins/eagle/details.txt \ |
| 609 | 604 | $(SRCDIR)/../skins/eagle/footer.txt \ |
| 610 | 605 | $(SRCDIR)/../skins/eagle/header.txt \ |
| 611 | - $(SRCDIR)/../skins/enhanced1/css.txt \ | |
| 612 | - $(SRCDIR)/../skins/enhanced1/details.txt \ | |
| 613 | - $(SRCDIR)/../skins/enhanced1/footer.txt \ | |
| 614 | - $(SRCDIR)/../skins/enhanced1/header.txt \ | |
| 615 | 606 | $(SRCDIR)/../skins/khaki/css.txt \ |
| 616 | 607 | $(SRCDIR)/../skins/khaki/details.txt \ |
| 617 | 608 | $(SRCDIR)/../skins/khaki/footer.txt \ |
| 618 | 609 | $(SRCDIR)/../skins/khaki/header.txt \ |
| 619 | 610 | $(SRCDIR)/../skins/original/css.txt \ |
| @@ -622,19 +613,20 @@ | ||
| 622 | 613 | $(SRCDIR)/../skins/original/header.txt \ |
| 623 | 614 | $(SRCDIR)/../skins/plain_gray/css.txt \ |
| 624 | 615 | $(SRCDIR)/../skins/plain_gray/details.txt \ |
| 625 | 616 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 626 | 617 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 627 | - $(SRCDIR)/../skins/rounded1/css.txt \ | |
| 628 | - $(SRCDIR)/../skins/rounded1/details.txt \ | |
| 629 | - $(SRCDIR)/../skins/rounded1/footer.txt \ | |
| 630 | - $(SRCDIR)/../skins/rounded1/header.txt \ | |
| 631 | 618 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 632 | 619 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 633 | 620 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 634 | 621 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 635 | 622 | $(SRCDIR)/accordion.js \ |
| 623 | + $(SRCDIR)/alerts/bflat2.wav \ | |
| 624 | + $(SRCDIR)/alerts/bflat3.wav \ | |
| 625 | + $(SRCDIR)/alerts/bloop.wav \ | |
| 626 | + $(SRCDIR)/alerts/plunk.wav \ | |
| 627 | + $(SRCDIR)/chat.js \ | |
| 636 | 628 | $(SRCDIR)/ci_edit.js \ |
| 637 | 629 | $(SRCDIR)/copybtn.js \ |
| 638 | 630 | $(SRCDIR)/default.css \ |
| 639 | 631 | $(SRCDIR)/diff.tcl \ |
| 640 | 632 | $(SRCDIR)/forum.js \ |
| @@ -641,10 +633,11 @@ | ||
| 641 | 633 | $(SRCDIR)/fossil.bootstrap.js \ |
| 642 | 634 | $(SRCDIR)/fossil.confirmer.js \ |
| 643 | 635 | $(SRCDIR)/fossil.copybutton.js \ |
| 644 | 636 | $(SRCDIR)/fossil.dom.js \ |
| 645 | 637 | $(SRCDIR)/fossil.fetch.js \ |
| 638 | + $(SRCDIR)/fossil.info-diff.js \ | |
| 646 | 639 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 647 | 640 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 648 | 641 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 649 | 642 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 650 | 643 | $(SRCDIR)/fossil.page.wikiedit.js \ |
| @@ -652,10 +645,11 @@ | ||
| 652 | 645 | $(SRCDIR)/fossil.popupwidget.js \ |
| 653 | 646 | $(SRCDIR)/fossil.storage.js \ |
| 654 | 647 | $(SRCDIR)/fossil.tabs.js \ |
| 655 | 648 | $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ |
| 656 | 649 | $(SRCDIR)/graph.js \ |
| 650 | + $(SRCDIR)/hbmenu.js \ | |
| 657 | 651 | $(SRCDIR)/href.js \ |
| 658 | 652 | $(SRCDIR)/login.js \ |
| 659 | 653 | $(SRCDIR)/markdown.md \ |
| 660 | 654 | $(SRCDIR)/menu.js \ |
| 661 | 655 | $(SRCDIR)/sbsdiff.js \ |
| @@ -702,14 +696,16 @@ | ||
| 702 | 696 | $(OBJDIR)/bundle_.c \ |
| 703 | 697 | $(OBJDIR)/cache_.c \ |
| 704 | 698 | $(OBJDIR)/capabilities_.c \ |
| 705 | 699 | $(OBJDIR)/captcha_.c \ |
| 706 | 700 | $(OBJDIR)/cgi_.c \ |
| 701 | + $(OBJDIR)/chat_.c \ | |
| 707 | 702 | $(OBJDIR)/checkin_.c \ |
| 708 | 703 | $(OBJDIR)/checkout_.c \ |
| 709 | 704 | $(OBJDIR)/clearsign_.c \ |
| 710 | 705 | $(OBJDIR)/clone_.c \ |
| 706 | + $(OBJDIR)/color_.c \ | |
| 711 | 707 | $(OBJDIR)/comformat_.c \ |
| 712 | 708 | $(OBJDIR)/configure_.c \ |
| 713 | 709 | $(OBJDIR)/content_.c \ |
| 714 | 710 | $(OBJDIR)/cookies_.c \ |
| 715 | 711 | $(OBJDIR)/db_.c \ |
| @@ -822,11 +818,10 @@ | ||
| 822 | 818 | $(OBJDIR)/user_.c \ |
| 823 | 819 | $(OBJDIR)/utf8_.c \ |
| 824 | 820 | $(OBJDIR)/util_.c \ |
| 825 | 821 | $(OBJDIR)/verify_.c \ |
| 826 | 822 | $(OBJDIR)/vfile_.c \ |
| 827 | - $(OBJDIR)/webmail_.c \ | |
| 828 | 823 | $(OBJDIR)/wiki_.c \ |
| 829 | 824 | $(OBJDIR)/wikiformat_.c \ |
| 830 | 825 | $(OBJDIR)/winfile_.c \ |
| 831 | 826 | $(OBJDIR)/winhttp_.c \ |
| 832 | 827 | $(OBJDIR)/xfer_.c \ |
| @@ -850,14 +845,16 @@ | ||
| 850 | 845 | $(OBJDIR)/bundle.o \ |
| 851 | 846 | $(OBJDIR)/cache.o \ |
| 852 | 847 | $(OBJDIR)/capabilities.o \ |
| 853 | 848 | $(OBJDIR)/captcha.o \ |
| 854 | 849 | $(OBJDIR)/cgi.o \ |
| 850 | + $(OBJDIR)/chat.o \ | |
| 855 | 851 | $(OBJDIR)/checkin.o \ |
| 856 | 852 | $(OBJDIR)/checkout.o \ |
| 857 | 853 | $(OBJDIR)/clearsign.o \ |
| 858 | 854 | $(OBJDIR)/clone.o \ |
| 855 | + $(OBJDIR)/color.o \ | |
| 859 | 856 | $(OBJDIR)/comformat.o \ |
| 860 | 857 | $(OBJDIR)/configure.o \ |
| 861 | 858 | $(OBJDIR)/content.o \ |
| 862 | 859 | $(OBJDIR)/cookies.o \ |
| 863 | 860 | $(OBJDIR)/db.o \ |
| @@ -970,11 +967,10 @@ | ||
| 970 | 967 | $(OBJDIR)/user.o \ |
| 971 | 968 | $(OBJDIR)/utf8.o \ |
| 972 | 969 | $(OBJDIR)/util.o \ |
| 973 | 970 | $(OBJDIR)/verify.o \ |
| 974 | 971 | $(OBJDIR)/vfile.o \ |
| 975 | - $(OBJDIR)/webmail.o \ | |
| 976 | 972 | $(OBJDIR)/wiki.o \ |
| 977 | 973 | $(OBJDIR)/wikiformat.o \ |
| 978 | 974 | $(OBJDIR)/winfile.o \ |
| 979 | 975 | $(OBJDIR)/winhttp.o \ |
| 980 | 976 | $(OBJDIR)/xfer.o \ |
| @@ -1163,13 +1159,13 @@ | ||
| 1163 | 1159 | |
| 1164 | 1160 | ifdef FOSSIL_BUILD_SSL |
| 1165 | 1161 | APPTARGETS += openssl |
| 1166 | 1162 | endif |
| 1167 | 1163 | |
| 1168 | -$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o | |
| 1164 | +$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o | |
| 1169 | 1165 | $(CODECHECK1) $(TRANS_SRC) |
| 1170 | - $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1166 | + $(TCC) -o $@ $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1171 | 1167 | |
| 1172 | 1168 | # This rule prevents make from using its default rules to try build |
| 1173 | 1169 | # an executable named "manifest" out of the file named "manifest.c" |
| 1174 | 1170 | # |
| 1175 | 1171 | $(SRCDIR)/../manifest: |
| @@ -1213,14 +1209,16 @@ | ||
| 1213 | 1209 | $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \ |
| 1214 | 1210 | $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \ |
| 1215 | 1211 | $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \ |
| 1216 | 1212 | $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \ |
| 1217 | 1213 | $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \ |
| 1214 | + $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ | |
| 1218 | 1215 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 1219 | 1216 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 1220 | 1217 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1221 | 1218 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1219 | + $(OBJDIR)/color_.c:$(OBJDIR)/color.h \ | |
| 1222 | 1220 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1223 | 1221 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1224 | 1222 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1225 | 1223 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1226 | 1224 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1333,11 +1331,10 @@ | ||
| 1333 | 1331 | $(OBJDIR)/user_.c:$(OBJDIR)/user.h \ |
| 1334 | 1332 | $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \ |
| 1335 | 1333 | $(OBJDIR)/util_.c:$(OBJDIR)/util.h \ |
| 1336 | 1334 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ |
| 1337 | 1335 | $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ |
| 1338 | - $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ | |
| 1339 | 1336 | $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ |
| 1340 | 1337 | $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ |
| 1341 | 1338 | $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ |
| 1342 | 1339 | $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ |
| 1343 | 1340 | $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ |
| @@ -1493,10 +1490,18 @@ | ||
| 1493 | 1490 | |
| 1494 | 1491 | $(OBJDIR)/cgi.o: $(OBJDIR)/cgi_.c $(OBJDIR)/cgi.h $(SRCDIR)/config.h |
| 1495 | 1492 | $(XTCC) -o $(OBJDIR)/cgi.o -c $(OBJDIR)/cgi_.c |
| 1496 | 1493 | |
| 1497 | 1494 | $(OBJDIR)/cgi.h: $(OBJDIR)/headers |
| 1495 | + | |
| 1496 | +$(OBJDIR)/chat_.c: $(SRCDIR)/chat.c $(TRANSLATE) | |
| 1497 | + $(TRANSLATE) $(SRCDIR)/chat.c >$@ | |
| 1498 | + | |
| 1499 | +$(OBJDIR)/chat.o: $(OBJDIR)/chat_.c $(OBJDIR)/chat.h $(SRCDIR)/config.h | |
| 1500 | + $(XTCC) -o $(OBJDIR)/chat.o -c $(OBJDIR)/chat_.c | |
| 1501 | + | |
| 1502 | +$(OBJDIR)/chat.h: $(OBJDIR)/headers | |
| 1498 | 1503 | |
| 1499 | 1504 | $(OBJDIR)/checkin_.c: $(SRCDIR)/checkin.c $(TRANSLATE) |
| 1500 | 1505 | $(TRANSLATE) $(SRCDIR)/checkin.c >$@ |
| 1501 | 1506 | |
| 1502 | 1507 | $(OBJDIR)/checkin.o: $(OBJDIR)/checkin_.c $(OBJDIR)/checkin.h $(SRCDIR)/config.h |
| @@ -1525,10 +1530,18 @@ | ||
| 1525 | 1530 | |
| 1526 | 1531 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1527 | 1532 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1528 | 1533 | |
| 1529 | 1534 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1535 | + | |
| 1536 | +$(OBJDIR)/color_.c: $(SRCDIR)/color.c $(TRANSLATE) | |
| 1537 | + $(TRANSLATE) $(SRCDIR)/color.c >$@ | |
| 1538 | + | |
| 1539 | +$(OBJDIR)/color.o: $(OBJDIR)/color_.c $(OBJDIR)/color.h $(SRCDIR)/config.h | |
| 1540 | + $(XTCC) -o $(OBJDIR)/color.o -c $(OBJDIR)/color_.c | |
| 1541 | + | |
| 1542 | +$(OBJDIR)/color.h: $(OBJDIR)/headers | |
| 1530 | 1543 | |
| 1531 | 1544 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(TRANSLATE) |
| 1532 | 1545 | $(TRANSLATE) $(SRCDIR)/comformat.c >$@ |
| 1533 | 1546 | |
| 1534 | 1547 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| @@ -2454,18 +2467,10 @@ | ||
| 2454 | 2467 | $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h |
| 2455 | 2468 | $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c |
| 2456 | 2469 | |
| 2457 | 2470 | $(OBJDIR)/vfile.h: $(OBJDIR)/headers |
| 2458 | 2471 | |
| 2459 | -$(OBJDIR)/webmail_.c: $(SRCDIR)/webmail.c $(TRANSLATE) | |
| 2460 | - $(TRANSLATE) $(SRCDIR)/webmail.c >$@ | |
| 2461 | - | |
| 2462 | -$(OBJDIR)/webmail.o: $(OBJDIR)/webmail_.c $(OBJDIR)/webmail.h $(SRCDIR)/config.h | |
| 2463 | - $(XTCC) -o $(OBJDIR)/webmail.o -c $(OBJDIR)/webmail_.c | |
| 2464 | - | |
| 2465 | -$(OBJDIR)/webmail.h: $(OBJDIR)/headers | |
| 2466 | - | |
| 2467 | 2472 | $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(TRANSLATE) |
| 2468 | 2473 | $(TRANSLATE) $(SRCDIR)/wiki.c >$@ |
| 2469 | 2474 | |
| 2470 | 2475 | $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h |
| 2471 | 2476 | $(XTCC) -o $(OBJDIR)/wiki.o -c $(OBJDIR)/wiki_.c |
| 2472 | 2477 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -166,15 +166,12 @@ | |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| 167 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 168 | endif |
| 169 | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| @@ -444,14 +441,16 @@ | |
| 444 | $(SRCDIR)/bundle.c \ |
| 445 | $(SRCDIR)/cache.c \ |
| 446 | $(SRCDIR)/capabilities.c \ |
| 447 | $(SRCDIR)/captcha.c \ |
| 448 | $(SRCDIR)/cgi.c \ |
| 449 | $(SRCDIR)/checkin.c \ |
| 450 | $(SRCDIR)/checkout.c \ |
| 451 | $(SRCDIR)/clearsign.c \ |
| 452 | $(SRCDIR)/clone.c \ |
| 453 | $(SRCDIR)/comformat.c \ |
| 454 | $(SRCDIR)/configure.c \ |
| 455 | $(SRCDIR)/content.c \ |
| 456 | $(SRCDIR)/cookies.c \ |
| 457 | $(SRCDIR)/db.c \ |
| @@ -564,21 +563,19 @@ | |
| 564 | $(SRCDIR)/user.c \ |
| 565 | $(SRCDIR)/utf8.c \ |
| 566 | $(SRCDIR)/util.c \ |
| 567 | $(SRCDIR)/verify.c \ |
| 568 | $(SRCDIR)/vfile.c \ |
| 569 | $(SRCDIR)/webmail.c \ |
| 570 | $(SRCDIR)/wiki.c \ |
| 571 | $(SRCDIR)/wikiformat.c \ |
| 572 | $(SRCDIR)/winfile.c \ |
| 573 | $(SRCDIR)/winhttp.c \ |
| 574 | $(SRCDIR)/xfer.c \ |
| 575 | $(SRCDIR)/xfersetup.c \ |
| 576 | $(SRCDIR)/zip.c |
| 577 | |
| 578 | EXTRA_FILES = \ |
| 579 | $(SRCDIR)/../skins/aht/details.txt \ |
| 580 | $(SRCDIR)/../skins/ardoise/css.txt \ |
| 581 | $(SRCDIR)/../skins/ardoise/details.txt \ |
| 582 | $(SRCDIR)/../skins/ardoise/footer.txt \ |
| 583 | $(SRCDIR)/../skins/ardoise/header.txt \ |
| 584 | $(SRCDIR)/../skins/black_and_white/css.txt \ |
| @@ -588,32 +585,26 @@ | |
| 588 | $(SRCDIR)/../skins/blitz/css.txt \ |
| 589 | $(SRCDIR)/../skins/blitz/details.txt \ |
| 590 | $(SRCDIR)/../skins/blitz/footer.txt \ |
| 591 | $(SRCDIR)/../skins/blitz/header.txt \ |
| 592 | $(SRCDIR)/../skins/blitz/ticket.txt \ |
| 593 | $(SRCDIR)/../skins/blitz_no_logo/css.txt \ |
| 594 | $(SRCDIR)/../skins/blitz_no_logo/details.txt \ |
| 595 | $(SRCDIR)/../skins/blitz_no_logo/footer.txt \ |
| 596 | $(SRCDIR)/../skins/blitz_no_logo/header.txt \ |
| 597 | $(SRCDIR)/../skins/blitz_no_logo/ticket.txt \ |
| 598 | $(SRCDIR)/../skins/bootstrap/css.txt \ |
| 599 | $(SRCDIR)/../skins/bootstrap/details.txt \ |
| 600 | $(SRCDIR)/../skins/bootstrap/footer.txt \ |
| 601 | $(SRCDIR)/../skins/bootstrap/header.txt \ |
| 602 | $(SRCDIR)/../skins/default/css.txt \ |
| 603 | $(SRCDIR)/../skins/default/details.txt \ |
| 604 | $(SRCDIR)/../skins/default/footer.txt \ |
| 605 | $(SRCDIR)/../skins/default/header.txt \ |
| 606 | $(SRCDIR)/../skins/default/js.txt \ |
| 607 | $(SRCDIR)/../skins/eagle/css.txt \ |
| 608 | $(SRCDIR)/../skins/eagle/details.txt \ |
| 609 | $(SRCDIR)/../skins/eagle/footer.txt \ |
| 610 | $(SRCDIR)/../skins/eagle/header.txt \ |
| 611 | $(SRCDIR)/../skins/enhanced1/css.txt \ |
| 612 | $(SRCDIR)/../skins/enhanced1/details.txt \ |
| 613 | $(SRCDIR)/../skins/enhanced1/footer.txt \ |
| 614 | $(SRCDIR)/../skins/enhanced1/header.txt \ |
| 615 | $(SRCDIR)/../skins/khaki/css.txt \ |
| 616 | $(SRCDIR)/../skins/khaki/details.txt \ |
| 617 | $(SRCDIR)/../skins/khaki/footer.txt \ |
| 618 | $(SRCDIR)/../skins/khaki/header.txt \ |
| 619 | $(SRCDIR)/../skins/original/css.txt \ |
| @@ -622,19 +613,20 @@ | |
| 622 | $(SRCDIR)/../skins/original/header.txt \ |
| 623 | $(SRCDIR)/../skins/plain_gray/css.txt \ |
| 624 | $(SRCDIR)/../skins/plain_gray/details.txt \ |
| 625 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 626 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 627 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 628 | $(SRCDIR)/../skins/rounded1/details.txt \ |
| 629 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 630 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 631 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 632 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 633 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 634 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 635 | $(SRCDIR)/accordion.js \ |
| 636 | $(SRCDIR)/ci_edit.js \ |
| 637 | $(SRCDIR)/copybtn.js \ |
| 638 | $(SRCDIR)/default.css \ |
| 639 | $(SRCDIR)/diff.tcl \ |
| 640 | $(SRCDIR)/forum.js \ |
| @@ -641,10 +633,11 @@ | |
| 641 | $(SRCDIR)/fossil.bootstrap.js \ |
| 642 | $(SRCDIR)/fossil.confirmer.js \ |
| 643 | $(SRCDIR)/fossil.copybutton.js \ |
| 644 | $(SRCDIR)/fossil.dom.js \ |
| 645 | $(SRCDIR)/fossil.fetch.js \ |
| 646 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 647 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 648 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 649 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 650 | $(SRCDIR)/fossil.page.wikiedit.js \ |
| @@ -652,10 +645,11 @@ | |
| 652 | $(SRCDIR)/fossil.popupwidget.js \ |
| 653 | $(SRCDIR)/fossil.storage.js \ |
| 654 | $(SRCDIR)/fossil.tabs.js \ |
| 655 | $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ |
| 656 | $(SRCDIR)/graph.js \ |
| 657 | $(SRCDIR)/href.js \ |
| 658 | $(SRCDIR)/login.js \ |
| 659 | $(SRCDIR)/markdown.md \ |
| 660 | $(SRCDIR)/menu.js \ |
| 661 | $(SRCDIR)/sbsdiff.js \ |
| @@ -702,14 +696,16 @@ | |
| 702 | $(OBJDIR)/bundle_.c \ |
| 703 | $(OBJDIR)/cache_.c \ |
| 704 | $(OBJDIR)/capabilities_.c \ |
| 705 | $(OBJDIR)/captcha_.c \ |
| 706 | $(OBJDIR)/cgi_.c \ |
| 707 | $(OBJDIR)/checkin_.c \ |
| 708 | $(OBJDIR)/checkout_.c \ |
| 709 | $(OBJDIR)/clearsign_.c \ |
| 710 | $(OBJDIR)/clone_.c \ |
| 711 | $(OBJDIR)/comformat_.c \ |
| 712 | $(OBJDIR)/configure_.c \ |
| 713 | $(OBJDIR)/content_.c \ |
| 714 | $(OBJDIR)/cookies_.c \ |
| 715 | $(OBJDIR)/db_.c \ |
| @@ -822,11 +818,10 @@ | |
| 822 | $(OBJDIR)/user_.c \ |
| 823 | $(OBJDIR)/utf8_.c \ |
| 824 | $(OBJDIR)/util_.c \ |
| 825 | $(OBJDIR)/verify_.c \ |
| 826 | $(OBJDIR)/vfile_.c \ |
| 827 | $(OBJDIR)/webmail_.c \ |
| 828 | $(OBJDIR)/wiki_.c \ |
| 829 | $(OBJDIR)/wikiformat_.c \ |
| 830 | $(OBJDIR)/winfile_.c \ |
| 831 | $(OBJDIR)/winhttp_.c \ |
| 832 | $(OBJDIR)/xfer_.c \ |
| @@ -850,14 +845,16 @@ | |
| 850 | $(OBJDIR)/bundle.o \ |
| 851 | $(OBJDIR)/cache.o \ |
| 852 | $(OBJDIR)/capabilities.o \ |
| 853 | $(OBJDIR)/captcha.o \ |
| 854 | $(OBJDIR)/cgi.o \ |
| 855 | $(OBJDIR)/checkin.o \ |
| 856 | $(OBJDIR)/checkout.o \ |
| 857 | $(OBJDIR)/clearsign.o \ |
| 858 | $(OBJDIR)/clone.o \ |
| 859 | $(OBJDIR)/comformat.o \ |
| 860 | $(OBJDIR)/configure.o \ |
| 861 | $(OBJDIR)/content.o \ |
| 862 | $(OBJDIR)/cookies.o \ |
| 863 | $(OBJDIR)/db.o \ |
| @@ -970,11 +967,10 @@ | |
| 970 | $(OBJDIR)/user.o \ |
| 971 | $(OBJDIR)/utf8.o \ |
| 972 | $(OBJDIR)/util.o \ |
| 973 | $(OBJDIR)/verify.o \ |
| 974 | $(OBJDIR)/vfile.o \ |
| 975 | $(OBJDIR)/webmail.o \ |
| 976 | $(OBJDIR)/wiki.o \ |
| 977 | $(OBJDIR)/wikiformat.o \ |
| 978 | $(OBJDIR)/winfile.o \ |
| 979 | $(OBJDIR)/winhttp.o \ |
| 980 | $(OBJDIR)/xfer.o \ |
| @@ -1163,13 +1159,13 @@ | |
| 1163 | |
| 1164 | ifdef FOSSIL_BUILD_SSL |
| 1165 | APPTARGETS += openssl |
| 1166 | endif |
| 1167 | |
| 1168 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 1169 | $(CODECHECK1) $(TRANS_SRC) |
| 1170 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1171 | |
| 1172 | # This rule prevents make from using its default rules to try build |
| 1173 | # an executable named "manifest" out of the file named "manifest.c" |
| 1174 | # |
| 1175 | $(SRCDIR)/../manifest: |
| @@ -1213,14 +1209,16 @@ | |
| 1213 | $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \ |
| 1214 | $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \ |
| 1215 | $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \ |
| 1216 | $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \ |
| 1217 | $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \ |
| 1218 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 1219 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 1220 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1221 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1222 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1223 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1224 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1225 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1226 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1333,11 +1331,10 @@ | |
| 1333 | $(OBJDIR)/user_.c:$(OBJDIR)/user.h \ |
| 1334 | $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \ |
| 1335 | $(OBJDIR)/util_.c:$(OBJDIR)/util.h \ |
| 1336 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ |
| 1337 | $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ |
| 1338 | $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ |
| 1339 | $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ |
| 1340 | $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ |
| 1341 | $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ |
| 1342 | $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ |
| 1343 | $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ |
| @@ -1493,10 +1490,18 @@ | |
| 1493 | |
| 1494 | $(OBJDIR)/cgi.o: $(OBJDIR)/cgi_.c $(OBJDIR)/cgi.h $(SRCDIR)/config.h |
| 1495 | $(XTCC) -o $(OBJDIR)/cgi.o -c $(OBJDIR)/cgi_.c |
| 1496 | |
| 1497 | $(OBJDIR)/cgi.h: $(OBJDIR)/headers |
| 1498 | |
| 1499 | $(OBJDIR)/checkin_.c: $(SRCDIR)/checkin.c $(TRANSLATE) |
| 1500 | $(TRANSLATE) $(SRCDIR)/checkin.c >$@ |
| 1501 | |
| 1502 | $(OBJDIR)/checkin.o: $(OBJDIR)/checkin_.c $(OBJDIR)/checkin.h $(SRCDIR)/config.h |
| @@ -1525,10 +1530,18 @@ | |
| 1525 | |
| 1526 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1527 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1528 | |
| 1529 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1530 | |
| 1531 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(TRANSLATE) |
| 1532 | $(TRANSLATE) $(SRCDIR)/comformat.c >$@ |
| 1533 | |
| 1534 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| @@ -2454,18 +2467,10 @@ | |
| 2454 | $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h |
| 2455 | $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c |
| 2456 | |
| 2457 | $(OBJDIR)/vfile.h: $(OBJDIR)/headers |
| 2458 | |
| 2459 | $(OBJDIR)/webmail_.c: $(SRCDIR)/webmail.c $(TRANSLATE) |
| 2460 | $(TRANSLATE) $(SRCDIR)/webmail.c >$@ |
| 2461 | |
| 2462 | $(OBJDIR)/webmail.o: $(OBJDIR)/webmail_.c $(OBJDIR)/webmail.h $(SRCDIR)/config.h |
| 2463 | $(XTCC) -o $(OBJDIR)/webmail.o -c $(OBJDIR)/webmail_.c |
| 2464 | |
| 2465 | $(OBJDIR)/webmail.h: $(OBJDIR)/headers |
| 2466 | |
| 2467 | $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(TRANSLATE) |
| 2468 | $(TRANSLATE) $(SRCDIR)/wiki.c >$@ |
| 2469 | |
| 2470 | $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h |
| 2471 | $(XTCC) -o $(OBJDIR)/wiki.o -c $(OBJDIR)/wiki_.c |
| 2472 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -166,15 +166,12 @@ | |
| 166 | ifndef FOSSIL_ENABLE_MINIZ |
| 167 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 168 | endif |
| 169 | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # |
| 172 | OPENSSLDIR = $(SRCDIR)/../compat/openssl |
| 173 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 174 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 175 | |
| 176 | #### Either the directory where the Tcl library is installed or the Tcl |
| 177 | # source code directory resides (depending on the value of the macro |
| @@ -444,14 +441,16 @@ | |
| 441 | $(SRCDIR)/bundle.c \ |
| 442 | $(SRCDIR)/cache.c \ |
| 443 | $(SRCDIR)/capabilities.c \ |
| 444 | $(SRCDIR)/captcha.c \ |
| 445 | $(SRCDIR)/cgi.c \ |
| 446 | $(SRCDIR)/chat.c \ |
| 447 | $(SRCDIR)/checkin.c \ |
| 448 | $(SRCDIR)/checkout.c \ |
| 449 | $(SRCDIR)/clearsign.c \ |
| 450 | $(SRCDIR)/clone.c \ |
| 451 | $(SRCDIR)/color.c \ |
| 452 | $(SRCDIR)/comformat.c \ |
| 453 | $(SRCDIR)/configure.c \ |
| 454 | $(SRCDIR)/content.c \ |
| 455 | $(SRCDIR)/cookies.c \ |
| 456 | $(SRCDIR)/db.c \ |
| @@ -564,21 +563,19 @@ | |
| 563 | $(SRCDIR)/user.c \ |
| 564 | $(SRCDIR)/utf8.c \ |
| 565 | $(SRCDIR)/util.c \ |
| 566 | $(SRCDIR)/verify.c \ |
| 567 | $(SRCDIR)/vfile.c \ |
| 568 | $(SRCDIR)/wiki.c \ |
| 569 | $(SRCDIR)/wikiformat.c \ |
| 570 | $(SRCDIR)/winfile.c \ |
| 571 | $(SRCDIR)/winhttp.c \ |
| 572 | $(SRCDIR)/xfer.c \ |
| 573 | $(SRCDIR)/xfersetup.c \ |
| 574 | $(SRCDIR)/zip.c |
| 575 | |
| 576 | EXTRA_FILES = \ |
| 577 | $(SRCDIR)/../skins/ardoise/css.txt \ |
| 578 | $(SRCDIR)/../skins/ardoise/details.txt \ |
| 579 | $(SRCDIR)/../skins/ardoise/footer.txt \ |
| 580 | $(SRCDIR)/../skins/ardoise/header.txt \ |
| 581 | $(SRCDIR)/../skins/black_and_white/css.txt \ |
| @@ -588,32 +585,26 @@ | |
| 585 | $(SRCDIR)/../skins/blitz/css.txt \ |
| 586 | $(SRCDIR)/../skins/blitz/details.txt \ |
| 587 | $(SRCDIR)/../skins/blitz/footer.txt \ |
| 588 | $(SRCDIR)/../skins/blitz/header.txt \ |
| 589 | $(SRCDIR)/../skins/blitz/ticket.txt \ |
| 590 | $(SRCDIR)/../skins/bootstrap/css.txt \ |
| 591 | $(SRCDIR)/../skins/bootstrap/details.txt \ |
| 592 | $(SRCDIR)/../skins/bootstrap/footer.txt \ |
| 593 | $(SRCDIR)/../skins/bootstrap/header.txt \ |
| 594 | $(SRCDIR)/../skins/darkmode/css.txt \ |
| 595 | $(SRCDIR)/../skins/darkmode/details.txt \ |
| 596 | $(SRCDIR)/../skins/darkmode/footer.txt \ |
| 597 | $(SRCDIR)/../skins/darkmode/header.txt \ |
| 598 | $(SRCDIR)/../skins/default/css.txt \ |
| 599 | $(SRCDIR)/../skins/default/details.txt \ |
| 600 | $(SRCDIR)/../skins/default/footer.txt \ |
| 601 | $(SRCDIR)/../skins/default/header.txt \ |
| 602 | $(SRCDIR)/../skins/eagle/css.txt \ |
| 603 | $(SRCDIR)/../skins/eagle/details.txt \ |
| 604 | $(SRCDIR)/../skins/eagle/footer.txt \ |
| 605 | $(SRCDIR)/../skins/eagle/header.txt \ |
| 606 | $(SRCDIR)/../skins/khaki/css.txt \ |
| 607 | $(SRCDIR)/../skins/khaki/details.txt \ |
| 608 | $(SRCDIR)/../skins/khaki/footer.txt \ |
| 609 | $(SRCDIR)/../skins/khaki/header.txt \ |
| 610 | $(SRCDIR)/../skins/original/css.txt \ |
| @@ -622,19 +613,20 @@ | |
| 613 | $(SRCDIR)/../skins/original/header.txt \ |
| 614 | $(SRCDIR)/../skins/plain_gray/css.txt \ |
| 615 | $(SRCDIR)/../skins/plain_gray/details.txt \ |
| 616 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 617 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 618 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 619 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 620 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 621 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 622 | $(SRCDIR)/accordion.js \ |
| 623 | $(SRCDIR)/alerts/bflat2.wav \ |
| 624 | $(SRCDIR)/alerts/bflat3.wav \ |
| 625 | $(SRCDIR)/alerts/bloop.wav \ |
| 626 | $(SRCDIR)/alerts/plunk.wav \ |
| 627 | $(SRCDIR)/chat.js \ |
| 628 | $(SRCDIR)/ci_edit.js \ |
| 629 | $(SRCDIR)/copybtn.js \ |
| 630 | $(SRCDIR)/default.css \ |
| 631 | $(SRCDIR)/diff.tcl \ |
| 632 | $(SRCDIR)/forum.js \ |
| @@ -641,10 +633,11 @@ | |
| 633 | $(SRCDIR)/fossil.bootstrap.js \ |
| 634 | $(SRCDIR)/fossil.confirmer.js \ |
| 635 | $(SRCDIR)/fossil.copybutton.js \ |
| 636 | $(SRCDIR)/fossil.dom.js \ |
| 637 | $(SRCDIR)/fossil.fetch.js \ |
| 638 | $(SRCDIR)/fossil.info-diff.js \ |
| 639 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 640 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 641 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 642 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 643 | $(SRCDIR)/fossil.page.wikiedit.js \ |
| @@ -652,10 +645,11 @@ | |
| 645 | $(SRCDIR)/fossil.popupwidget.js \ |
| 646 | $(SRCDIR)/fossil.storage.js \ |
| 647 | $(SRCDIR)/fossil.tabs.js \ |
| 648 | $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ |
| 649 | $(SRCDIR)/graph.js \ |
| 650 | $(SRCDIR)/hbmenu.js \ |
| 651 | $(SRCDIR)/href.js \ |
| 652 | $(SRCDIR)/login.js \ |
| 653 | $(SRCDIR)/markdown.md \ |
| 654 | $(SRCDIR)/menu.js \ |
| 655 | $(SRCDIR)/sbsdiff.js \ |
| @@ -702,14 +696,16 @@ | |
| 696 | $(OBJDIR)/bundle_.c \ |
| 697 | $(OBJDIR)/cache_.c \ |
| 698 | $(OBJDIR)/capabilities_.c \ |
| 699 | $(OBJDIR)/captcha_.c \ |
| 700 | $(OBJDIR)/cgi_.c \ |
| 701 | $(OBJDIR)/chat_.c \ |
| 702 | $(OBJDIR)/checkin_.c \ |
| 703 | $(OBJDIR)/checkout_.c \ |
| 704 | $(OBJDIR)/clearsign_.c \ |
| 705 | $(OBJDIR)/clone_.c \ |
| 706 | $(OBJDIR)/color_.c \ |
| 707 | $(OBJDIR)/comformat_.c \ |
| 708 | $(OBJDIR)/configure_.c \ |
| 709 | $(OBJDIR)/content_.c \ |
| 710 | $(OBJDIR)/cookies_.c \ |
| 711 | $(OBJDIR)/db_.c \ |
| @@ -822,11 +818,10 @@ | |
| 818 | $(OBJDIR)/user_.c \ |
| 819 | $(OBJDIR)/utf8_.c \ |
| 820 | $(OBJDIR)/util_.c \ |
| 821 | $(OBJDIR)/verify_.c \ |
| 822 | $(OBJDIR)/vfile_.c \ |
| 823 | $(OBJDIR)/wiki_.c \ |
| 824 | $(OBJDIR)/wikiformat_.c \ |
| 825 | $(OBJDIR)/winfile_.c \ |
| 826 | $(OBJDIR)/winhttp_.c \ |
| 827 | $(OBJDIR)/xfer_.c \ |
| @@ -850,14 +845,16 @@ | |
| 845 | $(OBJDIR)/bundle.o \ |
| 846 | $(OBJDIR)/cache.o \ |
| 847 | $(OBJDIR)/capabilities.o \ |
| 848 | $(OBJDIR)/captcha.o \ |
| 849 | $(OBJDIR)/cgi.o \ |
| 850 | $(OBJDIR)/chat.o \ |
| 851 | $(OBJDIR)/checkin.o \ |
| 852 | $(OBJDIR)/checkout.o \ |
| 853 | $(OBJDIR)/clearsign.o \ |
| 854 | $(OBJDIR)/clone.o \ |
| 855 | $(OBJDIR)/color.o \ |
| 856 | $(OBJDIR)/comformat.o \ |
| 857 | $(OBJDIR)/configure.o \ |
| 858 | $(OBJDIR)/content.o \ |
| 859 | $(OBJDIR)/cookies.o \ |
| 860 | $(OBJDIR)/db.o \ |
| @@ -970,11 +967,10 @@ | |
| 967 | $(OBJDIR)/user.o \ |
| 968 | $(OBJDIR)/utf8.o \ |
| 969 | $(OBJDIR)/util.o \ |
| 970 | $(OBJDIR)/verify.o \ |
| 971 | $(OBJDIR)/vfile.o \ |
| 972 | $(OBJDIR)/wiki.o \ |
| 973 | $(OBJDIR)/wikiformat.o \ |
| 974 | $(OBJDIR)/winfile.o \ |
| 975 | $(OBJDIR)/winhttp.o \ |
| 976 | $(OBJDIR)/xfer.o \ |
| @@ -1163,13 +1159,13 @@ | |
| 1159 | |
| 1160 | ifdef FOSSIL_BUILD_SSL |
| 1161 | APPTARGETS += openssl |
| 1162 | endif |
| 1163 | |
| 1164 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o |
| 1165 | $(CODECHECK1) $(TRANS_SRC) |
| 1166 | $(TCC) -o $@ $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1167 | |
| 1168 | # This rule prevents make from using its default rules to try build |
| 1169 | # an executable named "manifest" out of the file named "manifest.c" |
| 1170 | # |
| 1171 | $(SRCDIR)/../manifest: |
| @@ -1213,14 +1209,16 @@ | |
| 1209 | $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \ |
| 1210 | $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \ |
| 1211 | $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \ |
| 1212 | $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \ |
| 1213 | $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \ |
| 1214 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 1215 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 1216 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 1217 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1218 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1219 | $(OBJDIR)/color_.c:$(OBJDIR)/color.h \ |
| 1220 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1221 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1222 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1223 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1224 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1333,11 +1331,10 @@ | |
| 1331 | $(OBJDIR)/user_.c:$(OBJDIR)/user.h \ |
| 1332 | $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \ |
| 1333 | $(OBJDIR)/util_.c:$(OBJDIR)/util.h \ |
| 1334 | $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \ |
| 1335 | $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \ |
| 1336 | $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ |
| 1337 | $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ |
| 1338 | $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ |
| 1339 | $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ |
| 1340 | $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ |
| @@ -1493,10 +1490,18 @@ | |
| 1490 | |
| 1491 | $(OBJDIR)/cgi.o: $(OBJDIR)/cgi_.c $(OBJDIR)/cgi.h $(SRCDIR)/config.h |
| 1492 | $(XTCC) -o $(OBJDIR)/cgi.o -c $(OBJDIR)/cgi_.c |
| 1493 | |
| 1494 | $(OBJDIR)/cgi.h: $(OBJDIR)/headers |
| 1495 | |
| 1496 | $(OBJDIR)/chat_.c: $(SRCDIR)/chat.c $(TRANSLATE) |
| 1497 | $(TRANSLATE) $(SRCDIR)/chat.c >$@ |
| 1498 | |
| 1499 | $(OBJDIR)/chat.o: $(OBJDIR)/chat_.c $(OBJDIR)/chat.h $(SRCDIR)/config.h |
| 1500 | $(XTCC) -o $(OBJDIR)/chat.o -c $(OBJDIR)/chat_.c |
| 1501 | |
| 1502 | $(OBJDIR)/chat.h: $(OBJDIR)/headers |
| 1503 | |
| 1504 | $(OBJDIR)/checkin_.c: $(SRCDIR)/checkin.c $(TRANSLATE) |
| 1505 | $(TRANSLATE) $(SRCDIR)/checkin.c >$@ |
| 1506 | |
| 1507 | $(OBJDIR)/checkin.o: $(OBJDIR)/checkin_.c $(OBJDIR)/checkin.h $(SRCDIR)/config.h |
| @@ -1525,10 +1530,18 @@ | |
| 1530 | |
| 1531 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1532 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1533 | |
| 1534 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1535 | |
| 1536 | $(OBJDIR)/color_.c: $(SRCDIR)/color.c $(TRANSLATE) |
| 1537 | $(TRANSLATE) $(SRCDIR)/color.c >$@ |
| 1538 | |
| 1539 | $(OBJDIR)/color.o: $(OBJDIR)/color_.c $(OBJDIR)/color.h $(SRCDIR)/config.h |
| 1540 | $(XTCC) -o $(OBJDIR)/color.o -c $(OBJDIR)/color_.c |
| 1541 | |
| 1542 | $(OBJDIR)/color.h: $(OBJDIR)/headers |
| 1543 | |
| 1544 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(TRANSLATE) |
| 1545 | $(TRANSLATE) $(SRCDIR)/comformat.c >$@ |
| 1546 | |
| 1547 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| @@ -2454,18 +2467,10 @@ | |
| 2467 | $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h |
| 2468 | $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c |
| 2469 | |
| 2470 | $(OBJDIR)/vfile.h: $(OBJDIR)/headers |
| 2471 | |
| 2472 | $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(TRANSLATE) |
| 2473 | $(TRANSLATE) $(SRCDIR)/wiki.c >$@ |
| 2474 | |
| 2475 | $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h |
| 2476 | $(XTCC) -o $(OBJDIR)/wiki.o -c $(OBJDIR)/wiki_.c |
| 2477 |