Fossil SCM
Update the custom MinGW makefile.
Commit
6eb1f43485233480b7327fd9d31181f4c681b262adee0a5d90eb0b9238fbdd4f
Parent
273dd80e85ff565…
1 file changed
+22
-13
+22
-13
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -478,10 +478,11 @@ | ||
| 478 | 478 | $(SRCDIR)/fuzz.c \ |
| 479 | 479 | $(SRCDIR)/glob.c \ |
| 480 | 480 | $(SRCDIR)/graph.c \ |
| 481 | 481 | $(SRCDIR)/gzip.c \ |
| 482 | 482 | $(SRCDIR)/hname.c \ |
| 483 | + $(SRCDIR)/hook.c \ | |
| 483 | 484 | $(SRCDIR)/http.c \ |
| 484 | 485 | $(SRCDIR)/http_socket.c \ |
| 485 | 486 | $(SRCDIR)/http_ssl.c \ |
| 486 | 487 | $(SRCDIR)/http_transport.c \ |
| 487 | 488 | $(SRCDIR)/import.c \ |
| @@ -565,11 +566,10 @@ | ||
| 565 | 566 | $(SRCDIR)/webmail.c \ |
| 566 | 567 | $(SRCDIR)/wiki.c \ |
| 567 | 568 | $(SRCDIR)/wikiformat.c \ |
| 568 | 569 | $(SRCDIR)/winfile.c \ |
| 569 | 570 | $(SRCDIR)/winhttp.c \ |
| 570 | - $(SRCDIR)/wysiwyg.c \ | |
| 571 | 571 | $(SRCDIR)/xfer.c \ |
| 572 | 572 | $(SRCDIR)/xfersetup.c \ |
| 573 | 573 | $(SRCDIR)/zip.c |
| 574 | 574 | |
| 575 | 575 | EXTRA_FILES = \ |
| @@ -635,13 +635,18 @@ | ||
| 635 | 635 | $(SRCDIR)/default.css \ |
| 636 | 636 | $(SRCDIR)/diff.tcl \ |
| 637 | 637 | $(SRCDIR)/forum.js \ |
| 638 | 638 | $(SRCDIR)/fossil.bootstrap.js \ |
| 639 | 639 | $(SRCDIR)/fossil.confirmer.js \ |
| 640 | + $(SRCDIR)/fossil.copybutton.js \ | |
| 640 | 641 | $(SRCDIR)/fossil.dom.js \ |
| 641 | 642 | $(SRCDIR)/fossil.fetch.js \ |
| 643 | + $(SRCDIR)/fossil.numbered-lines.js \ | |
| 642 | 644 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 645 | + $(SRCDIR)/fossil.page.forumpost.js \ | |
| 646 | + $(SRCDIR)/fossil.page.wikiedit.js \ | |
| 647 | + $(SRCDIR)/fossil.popupwidget.js \ | |
| 643 | 648 | $(SRCDIR)/fossil.storage.js \ |
| 644 | 649 | $(SRCDIR)/fossil.tabs.js \ |
| 645 | 650 | $(SRCDIR)/graph.js \ |
| 646 | 651 | $(SRCDIR)/href.js \ |
| 647 | 652 | $(SRCDIR)/login.js \ |
| @@ -667,10 +672,11 @@ | ||
| 667 | 672 | $(SRCDIR)/sounds/d.wav \ |
| 668 | 673 | $(SRCDIR)/sounds/e.wav \ |
| 669 | 674 | $(SRCDIR)/sounds/f.wav \ |
| 670 | 675 | $(SRCDIR)/style.admin_log.css \ |
| 671 | 676 | $(SRCDIR)/style.fileedit.css \ |
| 677 | + $(SRCDIR)/style.wikiedit.css \ | |
| 672 | 678 | $(SRCDIR)/tree.js \ |
| 673 | 679 | $(SRCDIR)/useredit.js \ |
| 674 | 680 | $(SRCDIR)/wiki.wiki |
| 675 | 681 | |
| 676 | 682 | TRANS_SRC = \ |
| @@ -724,10 +730,11 @@ | ||
| 724 | 730 | $(OBJDIR)/fuzz_.c \ |
| 725 | 731 | $(OBJDIR)/glob_.c \ |
| 726 | 732 | $(OBJDIR)/graph_.c \ |
| 727 | 733 | $(OBJDIR)/gzip_.c \ |
| 728 | 734 | $(OBJDIR)/hname_.c \ |
| 735 | + $(OBJDIR)/hook_.c \ | |
| 729 | 736 | $(OBJDIR)/http_.c \ |
| 730 | 737 | $(OBJDIR)/http_socket_.c \ |
| 731 | 738 | $(OBJDIR)/http_ssl_.c \ |
| 732 | 739 | $(OBJDIR)/http_transport_.c \ |
| 733 | 740 | $(OBJDIR)/import_.c \ |
| @@ -811,11 +818,10 @@ | ||
| 811 | 818 | $(OBJDIR)/webmail_.c \ |
| 812 | 819 | $(OBJDIR)/wiki_.c \ |
| 813 | 820 | $(OBJDIR)/wikiformat_.c \ |
| 814 | 821 | $(OBJDIR)/winfile_.c \ |
| 815 | 822 | $(OBJDIR)/winhttp_.c \ |
| 816 | - $(OBJDIR)/wysiwyg_.c \ | |
| 817 | 823 | $(OBJDIR)/xfer_.c \ |
| 818 | 824 | $(OBJDIR)/xfersetup_.c \ |
| 819 | 825 | $(OBJDIR)/zip_.c |
| 820 | 826 | |
| 821 | 827 | OBJ = \ |
| @@ -869,10 +875,11 @@ | ||
| 869 | 875 | $(OBJDIR)/fuzz.o \ |
| 870 | 876 | $(OBJDIR)/glob.o \ |
| 871 | 877 | $(OBJDIR)/graph.o \ |
| 872 | 878 | $(OBJDIR)/gzip.o \ |
| 873 | 879 | $(OBJDIR)/hname.o \ |
| 880 | + $(OBJDIR)/hook.o \ | |
| 874 | 881 | $(OBJDIR)/http.o \ |
| 875 | 882 | $(OBJDIR)/http_socket.o \ |
| 876 | 883 | $(OBJDIR)/http_ssl.o \ |
| 877 | 884 | $(OBJDIR)/http_transport.o \ |
| 878 | 885 | $(OBJDIR)/import.o \ |
| @@ -956,11 +963,10 @@ | ||
| 956 | 963 | $(OBJDIR)/webmail.o \ |
| 957 | 964 | $(OBJDIR)/wiki.o \ |
| 958 | 965 | $(OBJDIR)/wikiformat.o \ |
| 959 | 966 | $(OBJDIR)/winfile.o \ |
| 960 | 967 | $(OBJDIR)/winhttp.o \ |
| 961 | - $(OBJDIR)/wysiwyg.o \ | |
| 962 | 968 | $(OBJDIR)/xfer.o \ |
| 963 | 969 | $(OBJDIR)/xfersetup.o \ |
| 964 | 970 | $(OBJDIR)/zip.o |
| 965 | 971 | |
| 966 | 972 | APPNAME = fossil.exe |
| @@ -1057,13 +1063,16 @@ | ||
| 1057 | 1063 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 1058 | 1064 | # the repository after running the tests. |
| 1059 | 1065 | test: $(OBJDIR) $(APPNAME) |
| 1060 | 1066 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 1061 | 1067 | |
| 1062 | -$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) | |
| 1068 | +$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) $(OBJDIR)/phony.h | |
| 1063 | 1069 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 1064 | 1070 | |
| 1071 | +$(OBJDIR)/phony.h: | |
| 1072 | + # Force rebuild of VERSION.h every time "make" is run | |
| 1073 | + | |
| 1065 | 1074 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 1066 | 1075 | # to 1. If it is set to 1, then there is no need to build or link |
| 1067 | 1076 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 1068 | 1077 | # using -lsqlite3. |
| 1069 | 1078 | SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o |
| @@ -1226,10 +1235,11 @@ | ||
| 1226 | 1235 | $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \ |
| 1227 | 1236 | $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \ |
| 1228 | 1237 | $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \ |
| 1229 | 1238 | $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \ |
| 1230 | 1239 | $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \ |
| 1240 | + $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \ | |
| 1231 | 1241 | $(OBJDIR)/http_.c:$(OBJDIR)/http.h \ |
| 1232 | 1242 | $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \ |
| 1233 | 1243 | $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \ |
| 1234 | 1244 | $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \ |
| 1235 | 1245 | $(OBJDIR)/import_.c:$(OBJDIR)/import.h \ |
| @@ -1313,11 +1323,10 @@ | ||
| 1313 | 1323 | $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ |
| 1314 | 1324 | $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ |
| 1315 | 1325 | $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ |
| 1316 | 1326 | $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ |
| 1317 | 1327 | $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ |
| 1318 | - $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h \ | |
| 1319 | 1328 | $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ |
| 1320 | 1329 | $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \ |
| 1321 | 1330 | $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \ |
| 1322 | 1331 | $(SRCDIR)/sqlite3.h \ |
| 1323 | 1332 | $(SRCDIR)/th.h \ |
| @@ -1741,10 +1750,18 @@ | ||
| 1741 | 1750 | |
| 1742 | 1751 | $(OBJDIR)/hname.o: $(OBJDIR)/hname_.c $(OBJDIR)/hname.h $(SRCDIR)/config.h |
| 1743 | 1752 | $(XTCC) -o $(OBJDIR)/hname.o -c $(OBJDIR)/hname_.c |
| 1744 | 1753 | |
| 1745 | 1754 | $(OBJDIR)/hname.h: $(OBJDIR)/headers |
| 1755 | + | |
| 1756 | +$(OBJDIR)/hook_.c: $(SRCDIR)/hook.c $(TRANSLATE) | |
| 1757 | + $(TRANSLATE) $(SRCDIR)/hook.c >$@ | |
| 1758 | + | |
| 1759 | +$(OBJDIR)/hook.o: $(OBJDIR)/hook_.c $(OBJDIR)/hook.h $(SRCDIR)/config.h | |
| 1760 | + $(XTCC) -o $(OBJDIR)/hook.o -c $(OBJDIR)/hook_.c | |
| 1761 | + | |
| 1762 | +$(OBJDIR)/hook.h: $(OBJDIR)/headers | |
| 1746 | 1763 | |
| 1747 | 1764 | $(OBJDIR)/http_.c: $(SRCDIR)/http.c $(TRANSLATE) |
| 1748 | 1765 | $(TRANSLATE) $(SRCDIR)/http.c >$@ |
| 1749 | 1766 | |
| 1750 | 1767 | $(OBJDIR)/http.o: $(OBJDIR)/http_.c $(OBJDIR)/http.h $(SRCDIR)/config.h |
| @@ -2438,18 +2455,10 @@ | ||
| 2438 | 2455 | $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h |
| 2439 | 2456 | $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c |
| 2440 | 2457 | |
| 2441 | 2458 | $(OBJDIR)/winhttp.h: $(OBJDIR)/headers |
| 2442 | 2459 | |
| 2443 | -$(OBJDIR)/wysiwyg_.c: $(SRCDIR)/wysiwyg.c $(TRANSLATE) | |
| 2444 | - $(TRANSLATE) $(SRCDIR)/wysiwyg.c >$@ | |
| 2445 | - | |
| 2446 | -$(OBJDIR)/wysiwyg.o: $(OBJDIR)/wysiwyg_.c $(OBJDIR)/wysiwyg.h $(SRCDIR)/config.h | |
| 2447 | - $(XTCC) -o $(OBJDIR)/wysiwyg.o -c $(OBJDIR)/wysiwyg_.c | |
| 2448 | - | |
| 2449 | -$(OBJDIR)/wysiwyg.h: $(OBJDIR)/headers | |
| 2450 | - | |
| 2451 | 2460 | $(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(TRANSLATE) |
| 2452 | 2461 | $(TRANSLATE) $(SRCDIR)/xfer.c >$@ |
| 2453 | 2462 | |
| 2454 | 2463 | $(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h |
| 2455 | 2464 | $(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c |
| 2456 | 2465 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -478,10 +478,11 @@ | |
| 478 | $(SRCDIR)/fuzz.c \ |
| 479 | $(SRCDIR)/glob.c \ |
| 480 | $(SRCDIR)/graph.c \ |
| 481 | $(SRCDIR)/gzip.c \ |
| 482 | $(SRCDIR)/hname.c \ |
| 483 | $(SRCDIR)/http.c \ |
| 484 | $(SRCDIR)/http_socket.c \ |
| 485 | $(SRCDIR)/http_ssl.c \ |
| 486 | $(SRCDIR)/http_transport.c \ |
| 487 | $(SRCDIR)/import.c \ |
| @@ -565,11 +566,10 @@ | |
| 565 | $(SRCDIR)/webmail.c \ |
| 566 | $(SRCDIR)/wiki.c \ |
| 567 | $(SRCDIR)/wikiformat.c \ |
| 568 | $(SRCDIR)/winfile.c \ |
| 569 | $(SRCDIR)/winhttp.c \ |
| 570 | $(SRCDIR)/wysiwyg.c \ |
| 571 | $(SRCDIR)/xfer.c \ |
| 572 | $(SRCDIR)/xfersetup.c \ |
| 573 | $(SRCDIR)/zip.c |
| 574 | |
| 575 | EXTRA_FILES = \ |
| @@ -635,13 +635,18 @@ | |
| 635 | $(SRCDIR)/default.css \ |
| 636 | $(SRCDIR)/diff.tcl \ |
| 637 | $(SRCDIR)/forum.js \ |
| 638 | $(SRCDIR)/fossil.bootstrap.js \ |
| 639 | $(SRCDIR)/fossil.confirmer.js \ |
| 640 | $(SRCDIR)/fossil.dom.js \ |
| 641 | $(SRCDIR)/fossil.fetch.js \ |
| 642 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 643 | $(SRCDIR)/fossil.storage.js \ |
| 644 | $(SRCDIR)/fossil.tabs.js \ |
| 645 | $(SRCDIR)/graph.js \ |
| 646 | $(SRCDIR)/href.js \ |
| 647 | $(SRCDIR)/login.js \ |
| @@ -667,10 +672,11 @@ | |
| 667 | $(SRCDIR)/sounds/d.wav \ |
| 668 | $(SRCDIR)/sounds/e.wav \ |
| 669 | $(SRCDIR)/sounds/f.wav \ |
| 670 | $(SRCDIR)/style.admin_log.css \ |
| 671 | $(SRCDIR)/style.fileedit.css \ |
| 672 | $(SRCDIR)/tree.js \ |
| 673 | $(SRCDIR)/useredit.js \ |
| 674 | $(SRCDIR)/wiki.wiki |
| 675 | |
| 676 | TRANS_SRC = \ |
| @@ -724,10 +730,11 @@ | |
| 724 | $(OBJDIR)/fuzz_.c \ |
| 725 | $(OBJDIR)/glob_.c \ |
| 726 | $(OBJDIR)/graph_.c \ |
| 727 | $(OBJDIR)/gzip_.c \ |
| 728 | $(OBJDIR)/hname_.c \ |
| 729 | $(OBJDIR)/http_.c \ |
| 730 | $(OBJDIR)/http_socket_.c \ |
| 731 | $(OBJDIR)/http_ssl_.c \ |
| 732 | $(OBJDIR)/http_transport_.c \ |
| 733 | $(OBJDIR)/import_.c \ |
| @@ -811,11 +818,10 @@ | |
| 811 | $(OBJDIR)/webmail_.c \ |
| 812 | $(OBJDIR)/wiki_.c \ |
| 813 | $(OBJDIR)/wikiformat_.c \ |
| 814 | $(OBJDIR)/winfile_.c \ |
| 815 | $(OBJDIR)/winhttp_.c \ |
| 816 | $(OBJDIR)/wysiwyg_.c \ |
| 817 | $(OBJDIR)/xfer_.c \ |
| 818 | $(OBJDIR)/xfersetup_.c \ |
| 819 | $(OBJDIR)/zip_.c |
| 820 | |
| 821 | OBJ = \ |
| @@ -869,10 +875,11 @@ | |
| 869 | $(OBJDIR)/fuzz.o \ |
| 870 | $(OBJDIR)/glob.o \ |
| 871 | $(OBJDIR)/graph.o \ |
| 872 | $(OBJDIR)/gzip.o \ |
| 873 | $(OBJDIR)/hname.o \ |
| 874 | $(OBJDIR)/http.o \ |
| 875 | $(OBJDIR)/http_socket.o \ |
| 876 | $(OBJDIR)/http_ssl.o \ |
| 877 | $(OBJDIR)/http_transport.o \ |
| 878 | $(OBJDIR)/import.o \ |
| @@ -956,11 +963,10 @@ | |
| 956 | $(OBJDIR)/webmail.o \ |
| 957 | $(OBJDIR)/wiki.o \ |
| 958 | $(OBJDIR)/wikiformat.o \ |
| 959 | $(OBJDIR)/winfile.o \ |
| 960 | $(OBJDIR)/winhttp.o \ |
| 961 | $(OBJDIR)/wysiwyg.o \ |
| 962 | $(OBJDIR)/xfer.o \ |
| 963 | $(OBJDIR)/xfersetup.o \ |
| 964 | $(OBJDIR)/zip.o |
| 965 | |
| 966 | APPNAME = fossil.exe |
| @@ -1057,13 +1063,16 @@ | |
| 1057 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 1058 | # the repository after running the tests. |
| 1059 | test: $(OBJDIR) $(APPNAME) |
| 1060 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 1061 | |
| 1062 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 1063 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 1064 | |
| 1065 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 1066 | # to 1. If it is set to 1, then there is no need to build or link |
| 1067 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 1068 | # using -lsqlite3. |
| 1069 | SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o |
| @@ -1226,10 +1235,11 @@ | |
| 1226 | $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \ |
| 1227 | $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \ |
| 1228 | $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \ |
| 1229 | $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \ |
| 1230 | $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \ |
| 1231 | $(OBJDIR)/http_.c:$(OBJDIR)/http.h \ |
| 1232 | $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \ |
| 1233 | $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \ |
| 1234 | $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \ |
| 1235 | $(OBJDIR)/import_.c:$(OBJDIR)/import.h \ |
| @@ -1313,11 +1323,10 @@ | |
| 1313 | $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ |
| 1314 | $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ |
| 1315 | $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ |
| 1316 | $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ |
| 1317 | $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ |
| 1318 | $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h \ |
| 1319 | $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ |
| 1320 | $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \ |
| 1321 | $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \ |
| 1322 | $(SRCDIR)/sqlite3.h \ |
| 1323 | $(SRCDIR)/th.h \ |
| @@ -1741,10 +1750,18 @@ | |
| 1741 | |
| 1742 | $(OBJDIR)/hname.o: $(OBJDIR)/hname_.c $(OBJDIR)/hname.h $(SRCDIR)/config.h |
| 1743 | $(XTCC) -o $(OBJDIR)/hname.o -c $(OBJDIR)/hname_.c |
| 1744 | |
| 1745 | $(OBJDIR)/hname.h: $(OBJDIR)/headers |
| 1746 | |
| 1747 | $(OBJDIR)/http_.c: $(SRCDIR)/http.c $(TRANSLATE) |
| 1748 | $(TRANSLATE) $(SRCDIR)/http.c >$@ |
| 1749 | |
| 1750 | $(OBJDIR)/http.o: $(OBJDIR)/http_.c $(OBJDIR)/http.h $(SRCDIR)/config.h |
| @@ -2438,18 +2455,10 @@ | |
| 2438 | $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h |
| 2439 | $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c |
| 2440 | |
| 2441 | $(OBJDIR)/winhttp.h: $(OBJDIR)/headers |
| 2442 | |
| 2443 | $(OBJDIR)/wysiwyg_.c: $(SRCDIR)/wysiwyg.c $(TRANSLATE) |
| 2444 | $(TRANSLATE) $(SRCDIR)/wysiwyg.c >$@ |
| 2445 | |
| 2446 | $(OBJDIR)/wysiwyg.o: $(OBJDIR)/wysiwyg_.c $(OBJDIR)/wysiwyg.h $(SRCDIR)/config.h |
| 2447 | $(XTCC) -o $(OBJDIR)/wysiwyg.o -c $(OBJDIR)/wysiwyg_.c |
| 2448 | |
| 2449 | $(OBJDIR)/wysiwyg.h: $(OBJDIR)/headers |
| 2450 | |
| 2451 | $(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(TRANSLATE) |
| 2452 | $(TRANSLATE) $(SRCDIR)/xfer.c >$@ |
| 2453 | |
| 2454 | $(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h |
| 2455 | $(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c |
| 2456 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -478,10 +478,11 @@ | |
| 478 | $(SRCDIR)/fuzz.c \ |
| 479 | $(SRCDIR)/glob.c \ |
| 480 | $(SRCDIR)/graph.c \ |
| 481 | $(SRCDIR)/gzip.c \ |
| 482 | $(SRCDIR)/hname.c \ |
| 483 | $(SRCDIR)/hook.c \ |
| 484 | $(SRCDIR)/http.c \ |
| 485 | $(SRCDIR)/http_socket.c \ |
| 486 | $(SRCDIR)/http_ssl.c \ |
| 487 | $(SRCDIR)/http_transport.c \ |
| 488 | $(SRCDIR)/import.c \ |
| @@ -565,11 +566,10 @@ | |
| 566 | $(SRCDIR)/webmail.c \ |
| 567 | $(SRCDIR)/wiki.c \ |
| 568 | $(SRCDIR)/wikiformat.c \ |
| 569 | $(SRCDIR)/winfile.c \ |
| 570 | $(SRCDIR)/winhttp.c \ |
| 571 | $(SRCDIR)/xfer.c \ |
| 572 | $(SRCDIR)/xfersetup.c \ |
| 573 | $(SRCDIR)/zip.c |
| 574 | |
| 575 | EXTRA_FILES = \ |
| @@ -635,13 +635,18 @@ | |
| 635 | $(SRCDIR)/default.css \ |
| 636 | $(SRCDIR)/diff.tcl \ |
| 637 | $(SRCDIR)/forum.js \ |
| 638 | $(SRCDIR)/fossil.bootstrap.js \ |
| 639 | $(SRCDIR)/fossil.confirmer.js \ |
| 640 | $(SRCDIR)/fossil.copybutton.js \ |
| 641 | $(SRCDIR)/fossil.dom.js \ |
| 642 | $(SRCDIR)/fossil.fetch.js \ |
| 643 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 644 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 645 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 646 | $(SRCDIR)/fossil.page.wikiedit.js \ |
| 647 | $(SRCDIR)/fossil.popupwidget.js \ |
| 648 | $(SRCDIR)/fossil.storage.js \ |
| 649 | $(SRCDIR)/fossil.tabs.js \ |
| 650 | $(SRCDIR)/graph.js \ |
| 651 | $(SRCDIR)/href.js \ |
| 652 | $(SRCDIR)/login.js \ |
| @@ -667,10 +672,11 @@ | |
| 672 | $(SRCDIR)/sounds/d.wav \ |
| 673 | $(SRCDIR)/sounds/e.wav \ |
| 674 | $(SRCDIR)/sounds/f.wav \ |
| 675 | $(SRCDIR)/style.admin_log.css \ |
| 676 | $(SRCDIR)/style.fileedit.css \ |
| 677 | $(SRCDIR)/style.wikiedit.css \ |
| 678 | $(SRCDIR)/tree.js \ |
| 679 | $(SRCDIR)/useredit.js \ |
| 680 | $(SRCDIR)/wiki.wiki |
| 681 | |
| 682 | TRANS_SRC = \ |
| @@ -724,10 +730,11 @@ | |
| 730 | $(OBJDIR)/fuzz_.c \ |
| 731 | $(OBJDIR)/glob_.c \ |
| 732 | $(OBJDIR)/graph_.c \ |
| 733 | $(OBJDIR)/gzip_.c \ |
| 734 | $(OBJDIR)/hname_.c \ |
| 735 | $(OBJDIR)/hook_.c \ |
| 736 | $(OBJDIR)/http_.c \ |
| 737 | $(OBJDIR)/http_socket_.c \ |
| 738 | $(OBJDIR)/http_ssl_.c \ |
| 739 | $(OBJDIR)/http_transport_.c \ |
| 740 | $(OBJDIR)/import_.c \ |
| @@ -811,11 +818,10 @@ | |
| 818 | $(OBJDIR)/webmail_.c \ |
| 819 | $(OBJDIR)/wiki_.c \ |
| 820 | $(OBJDIR)/wikiformat_.c \ |
| 821 | $(OBJDIR)/winfile_.c \ |
| 822 | $(OBJDIR)/winhttp_.c \ |
| 823 | $(OBJDIR)/xfer_.c \ |
| 824 | $(OBJDIR)/xfersetup_.c \ |
| 825 | $(OBJDIR)/zip_.c |
| 826 | |
| 827 | OBJ = \ |
| @@ -869,10 +875,11 @@ | |
| 875 | $(OBJDIR)/fuzz.o \ |
| 876 | $(OBJDIR)/glob.o \ |
| 877 | $(OBJDIR)/graph.o \ |
| 878 | $(OBJDIR)/gzip.o \ |
| 879 | $(OBJDIR)/hname.o \ |
| 880 | $(OBJDIR)/hook.o \ |
| 881 | $(OBJDIR)/http.o \ |
| 882 | $(OBJDIR)/http_socket.o \ |
| 883 | $(OBJDIR)/http_ssl.o \ |
| 884 | $(OBJDIR)/http_transport.o \ |
| 885 | $(OBJDIR)/import.o \ |
| @@ -956,11 +963,10 @@ | |
| 963 | $(OBJDIR)/webmail.o \ |
| 964 | $(OBJDIR)/wiki.o \ |
| 965 | $(OBJDIR)/wikiformat.o \ |
| 966 | $(OBJDIR)/winfile.o \ |
| 967 | $(OBJDIR)/winhttp.o \ |
| 968 | $(OBJDIR)/xfer.o \ |
| 969 | $(OBJDIR)/xfersetup.o \ |
| 970 | $(OBJDIR)/zip.o |
| 971 | |
| 972 | APPNAME = fossil.exe |
| @@ -1057,13 +1063,16 @@ | |
| 1063 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 1064 | # the repository after running the tests. |
| 1065 | test: $(OBJDIR) $(APPNAME) |
| 1066 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 1067 | |
| 1068 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) $(OBJDIR)/phony.h |
| 1069 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 1070 | |
| 1071 | $(OBJDIR)/phony.h: |
| 1072 | # Force rebuild of VERSION.h every time "make" is run |
| 1073 | |
| 1074 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 1075 | # to 1. If it is set to 1, then there is no need to build or link |
| 1076 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 1077 | # using -lsqlite3. |
| 1078 | SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o |
| @@ -1226,10 +1235,11 @@ | |
| 1235 | $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \ |
| 1236 | $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \ |
| 1237 | $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \ |
| 1238 | $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \ |
| 1239 | $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \ |
| 1240 | $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \ |
| 1241 | $(OBJDIR)/http_.c:$(OBJDIR)/http.h \ |
| 1242 | $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \ |
| 1243 | $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \ |
| 1244 | $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \ |
| 1245 | $(OBJDIR)/import_.c:$(OBJDIR)/import.h \ |
| @@ -1313,11 +1323,10 @@ | |
| 1323 | $(OBJDIR)/webmail_.c:$(OBJDIR)/webmail.h \ |
| 1324 | $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \ |
| 1325 | $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \ |
| 1326 | $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \ |
| 1327 | $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \ |
| 1328 | $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \ |
| 1329 | $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \ |
| 1330 | $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \ |
| 1331 | $(SRCDIR)/sqlite3.h \ |
| 1332 | $(SRCDIR)/th.h \ |
| @@ -1741,10 +1750,18 @@ | |
| 1750 | |
| 1751 | $(OBJDIR)/hname.o: $(OBJDIR)/hname_.c $(OBJDIR)/hname.h $(SRCDIR)/config.h |
| 1752 | $(XTCC) -o $(OBJDIR)/hname.o -c $(OBJDIR)/hname_.c |
| 1753 | |
| 1754 | $(OBJDIR)/hname.h: $(OBJDIR)/headers |
| 1755 | |
| 1756 | $(OBJDIR)/hook_.c: $(SRCDIR)/hook.c $(TRANSLATE) |
| 1757 | $(TRANSLATE) $(SRCDIR)/hook.c >$@ |
| 1758 | |
| 1759 | $(OBJDIR)/hook.o: $(OBJDIR)/hook_.c $(OBJDIR)/hook.h $(SRCDIR)/config.h |
| 1760 | $(XTCC) -o $(OBJDIR)/hook.o -c $(OBJDIR)/hook_.c |
| 1761 | |
| 1762 | $(OBJDIR)/hook.h: $(OBJDIR)/headers |
| 1763 | |
| 1764 | $(OBJDIR)/http_.c: $(SRCDIR)/http.c $(TRANSLATE) |
| 1765 | $(TRANSLATE) $(SRCDIR)/http.c >$@ |
| 1766 | |
| 1767 | $(OBJDIR)/http.o: $(OBJDIR)/http_.c $(OBJDIR)/http.h $(SRCDIR)/config.h |
| @@ -2438,18 +2455,10 @@ | |
| 2455 | $(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h |
| 2456 | $(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c |
| 2457 | |
| 2458 | $(OBJDIR)/winhttp.h: $(OBJDIR)/headers |
| 2459 | |
| 2460 | $(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(TRANSLATE) |
| 2461 | $(TRANSLATE) $(SRCDIR)/xfer.c >$@ |
| 2462 | |
| 2463 | $(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h |
| 2464 | $(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c |
| 2465 |