Fossil SCM
Update the custom MinGW makefile.
Commit
c7ad42d440b9b5648e64d6119d5ef8dbdd22fdbe171faac4d704c5efc4fa9528
Parent
a6c5a4620a5388f…
1 file changed
+34
-3
+34
-3
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -442,10 +442,11 @@ | ||
| 442 | 442 | $(SRCDIR)/clearsign.c \ |
| 443 | 443 | $(SRCDIR)/clone.c \ |
| 444 | 444 | $(SRCDIR)/comformat.c \ |
| 445 | 445 | $(SRCDIR)/configure.c \ |
| 446 | 446 | $(SRCDIR)/content.c \ |
| 447 | + $(SRCDIR)/cookies.c \ | |
| 447 | 448 | $(SRCDIR)/db.c \ |
| 448 | 449 | $(SRCDIR)/delta.c \ |
| 449 | 450 | $(SRCDIR)/deltacmd.c \ |
| 450 | 451 | $(SRCDIR)/descendants.c \ |
| 451 | 452 | $(SRCDIR)/diff.c \ |
| @@ -601,12 +602,23 @@ | ||
| 601 | 602 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 602 | 603 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 603 | 604 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 604 | 605 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 605 | 606 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 607 | + $(SRCDIR)/ci_edit.js \ | |
| 606 | 608 | $(SRCDIR)/diff.tcl \ |
| 609 | + $(SRCDIR)/graph.js \ | |
| 610 | + $(SRCDIR)/href.js \ | |
| 611 | + $(SRCDIR)/login.js \ | |
| 607 | 612 | $(SRCDIR)/markdown.md \ |
| 613 | + $(SRCDIR)/menu.js \ | |
| 614 | + $(SRCDIR)/sbsdiff.js \ | |
| 615 | + $(SRCDIR)/scroll.js \ | |
| 616 | + $(SRCDIR)/skin.js \ | |
| 617 | + $(SRCDIR)/sorttable.js \ | |
| 618 | + $(SRCDIR)/tree.js \ | |
| 619 | + $(SRCDIR)/useredit.js \ | |
| 608 | 620 | $(SRCDIR)/wiki.wiki |
| 609 | 621 | |
| 610 | 622 | TRANS_SRC = \ |
| 611 | 623 | $(OBJDIR)/add_.c \ |
| 612 | 624 | $(OBJDIR)/allrepo_.c \ |
| @@ -626,10 +638,11 @@ | ||
| 626 | 638 | $(OBJDIR)/clearsign_.c \ |
| 627 | 639 | $(OBJDIR)/clone_.c \ |
| 628 | 640 | $(OBJDIR)/comformat_.c \ |
| 629 | 641 | $(OBJDIR)/configure_.c \ |
| 630 | 642 | $(OBJDIR)/content_.c \ |
| 643 | + $(OBJDIR)/cookies_.c \ | |
| 631 | 644 | $(OBJDIR)/db_.c \ |
| 632 | 645 | $(OBJDIR)/delta_.c \ |
| 633 | 646 | $(OBJDIR)/deltacmd_.c \ |
| 634 | 647 | $(OBJDIR)/descendants_.c \ |
| 635 | 648 | $(OBJDIR)/diff_.c \ |
| @@ -754,10 +767,11 @@ | ||
| 754 | 767 | $(OBJDIR)/clearsign.o \ |
| 755 | 768 | $(OBJDIR)/clone.o \ |
| 756 | 769 | $(OBJDIR)/comformat.o \ |
| 757 | 770 | $(OBJDIR)/configure.o \ |
| 758 | 771 | $(OBJDIR)/content.o \ |
| 772 | + $(OBJDIR)/cookies.o \ | |
| 759 | 773 | $(OBJDIR)/db.o \ |
| 760 | 774 | $(OBJDIR)/delta.o \ |
| 761 | 775 | $(OBJDIR)/deltacmd.o \ |
| 762 | 776 | $(OBJDIR)/descendants.o \ |
| 763 | 777 | $(OBJDIR)/diff.o \ |
| @@ -877,10 +891,11 @@ | ||
| 877 | 891 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe) |
| 878 | 892 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe) |
| 879 | 893 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe) |
| 880 | 894 | MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe) |
| 881 | 895 | MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe) |
| 896 | +MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe) | |
| 882 | 897 | CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe) |
| 883 | 898 | CAT = type |
| 884 | 899 | CP = copy |
| 885 | 900 | GREP = find |
| 886 | 901 | MV = copy |
| @@ -891,10 +906,11 @@ | ||
| 891 | 906 | TRANSLATE = $(OBJDIR)/translate.exe |
| 892 | 907 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 893 | 908 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 894 | 909 | MKBUILTIN = $(OBJDIR)/mkbuiltin.exe |
| 895 | 910 | MKVERSION = $(OBJDIR)/mkversion.exe |
| 911 | +MKCSS = $(OBJDIR)/mkcss.exe | |
| 896 | 912 | CODECHECK1 = $(OBJDIR)/codecheck1.exe |
| 897 | 913 | CAT = cat |
| 898 | 914 | CP = cp |
| 899 | 915 | GREP = grep |
| 900 | 916 | MV = mv |
| @@ -903,11 +919,11 @@ | ||
| 903 | 919 | RMDIR = rm -rf |
| 904 | 920 | endif |
| 905 | 921 | |
| 906 | 922 | all: $(OBJDIR) $(APPNAME) |
| 907 | 923 | |
| 908 | -$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h | |
| 924 | +$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h | |
| 909 | 925 | ifdef USE_WINDOWS |
| 910 | 926 | $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h) |
| 911 | 927 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR)) |
| 912 | 928 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR)) |
| 913 | 929 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR)) |
| @@ -948,10 +964,13 @@ | ||
| 948 | 964 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 949 | 965 | |
| 950 | 966 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 951 | 967 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 952 | 968 | |
| 969 | +$(MKCSS): $(SRCDIR)/mkcss.c | |
| 970 | + $(XBCC) -o $@ $(SRCDIR)/mkcss.c | |
| 971 | + | |
| 953 | 972 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 954 | 973 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 955 | 974 | |
| 956 | 975 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 957 | 976 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| @@ -959,10 +978,13 @@ | ||
| 959 | 978 | test: $(OBJDIR) $(APPNAME) |
| 960 | 979 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 961 | 980 | |
| 962 | 981 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 963 | 982 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 983 | + | |
| 984 | +$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS) | |
| 985 | + $(MKCSS) $(SRCDIR)/default_css.txt $@ | |
| 964 | 986 | |
| 965 | 987 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 966 | 988 | # to 1. If it is set to 1, then there is no need to build or link |
| 967 | 989 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 968 | 990 | # using -lsqlite3. |
| @@ -1072,11 +1094,11 @@ | ||
| 1072 | 1094 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 1073 | 1095 | |
| 1074 | 1096 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 1075 | 1097 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 1076 | 1098 | |
| 1077 | -$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h | |
| 1099 | +$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h | |
| 1078 | 1100 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 1079 | 1101 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 1080 | 1102 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 1081 | 1103 | $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \ |
| 1082 | 1104 | $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \ |
| @@ -1093,10 +1115,11 @@ | ||
| 1093 | 1115 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1094 | 1116 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1095 | 1117 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1096 | 1118 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1097 | 1119 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1120 | + $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ | |
| 1098 | 1121 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| 1099 | 1122 | $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \ |
| 1100 | 1123 | $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \ |
| 1101 | 1124 | $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \ |
| 1102 | 1125 | $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \ |
| @@ -1367,10 +1390,18 @@ | ||
| 1367 | 1390 | |
| 1368 | 1391 | $(OBJDIR)/content.o: $(OBJDIR)/content_.c $(OBJDIR)/content.h $(SRCDIR)/config.h |
| 1369 | 1392 | $(XTCC) -o $(OBJDIR)/content.o -c $(OBJDIR)/content_.c |
| 1370 | 1393 | |
| 1371 | 1394 | $(OBJDIR)/content.h: $(OBJDIR)/headers |
| 1395 | + | |
| 1396 | +$(OBJDIR)/cookies_.c: $(SRCDIR)/cookies.c $(TRANSLATE) | |
| 1397 | + $(TRANSLATE) $(SRCDIR)/cookies.c >$@ | |
| 1398 | + | |
| 1399 | +$(OBJDIR)/cookies.o: $(OBJDIR)/cookies_.c $(OBJDIR)/cookies.h $(SRCDIR)/config.h | |
| 1400 | + $(XTCC) -o $(OBJDIR)/cookies.o -c $(OBJDIR)/cookies_.c | |
| 1401 | + | |
| 1402 | +$(OBJDIR)/cookies.h: $(OBJDIR)/headers | |
| 1372 | 1403 | |
| 1373 | 1404 | $(OBJDIR)/db_.c: $(SRCDIR)/db.c $(TRANSLATE) |
| 1374 | 1405 | $(TRANSLATE) $(SRCDIR)/db.c >$@ |
| 1375 | 1406 | |
| 1376 | 1407 | $(OBJDIR)/db.o: $(OBJDIR)/db_.c $(OBJDIR)/db.h $(SRCDIR)/config.h |
| @@ -2011,11 +2042,11 @@ | ||
| 2011 | 2042 | $(OBJDIR)/statrep.h: $(OBJDIR)/headers |
| 2012 | 2043 | |
| 2013 | 2044 | $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE) |
| 2014 | 2045 | $(TRANSLATE) $(SRCDIR)/style.c >$@ |
| 2015 | 2046 | |
| 2016 | -$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h | |
| 2047 | +$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h | |
| 2017 | 2048 | $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c |
| 2018 | 2049 | |
| 2019 | 2050 | $(OBJDIR)/style.h: $(OBJDIR)/headers |
| 2020 | 2051 | |
| 2021 | 2052 | $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE) |
| 2022 | 2053 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -442,10 +442,11 @@ | |
| 442 | $(SRCDIR)/clearsign.c \ |
| 443 | $(SRCDIR)/clone.c \ |
| 444 | $(SRCDIR)/comformat.c \ |
| 445 | $(SRCDIR)/configure.c \ |
| 446 | $(SRCDIR)/content.c \ |
| 447 | $(SRCDIR)/db.c \ |
| 448 | $(SRCDIR)/delta.c \ |
| 449 | $(SRCDIR)/deltacmd.c \ |
| 450 | $(SRCDIR)/descendants.c \ |
| 451 | $(SRCDIR)/diff.c \ |
| @@ -601,12 +602,23 @@ | |
| 601 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 602 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 603 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 604 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 605 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 606 | $(SRCDIR)/diff.tcl \ |
| 607 | $(SRCDIR)/markdown.md \ |
| 608 | $(SRCDIR)/wiki.wiki |
| 609 | |
| 610 | TRANS_SRC = \ |
| 611 | $(OBJDIR)/add_.c \ |
| 612 | $(OBJDIR)/allrepo_.c \ |
| @@ -626,10 +638,11 @@ | |
| 626 | $(OBJDIR)/clearsign_.c \ |
| 627 | $(OBJDIR)/clone_.c \ |
| 628 | $(OBJDIR)/comformat_.c \ |
| 629 | $(OBJDIR)/configure_.c \ |
| 630 | $(OBJDIR)/content_.c \ |
| 631 | $(OBJDIR)/db_.c \ |
| 632 | $(OBJDIR)/delta_.c \ |
| 633 | $(OBJDIR)/deltacmd_.c \ |
| 634 | $(OBJDIR)/descendants_.c \ |
| 635 | $(OBJDIR)/diff_.c \ |
| @@ -754,10 +767,11 @@ | |
| 754 | $(OBJDIR)/clearsign.o \ |
| 755 | $(OBJDIR)/clone.o \ |
| 756 | $(OBJDIR)/comformat.o \ |
| 757 | $(OBJDIR)/configure.o \ |
| 758 | $(OBJDIR)/content.o \ |
| 759 | $(OBJDIR)/db.o \ |
| 760 | $(OBJDIR)/delta.o \ |
| 761 | $(OBJDIR)/deltacmd.o \ |
| 762 | $(OBJDIR)/descendants.o \ |
| 763 | $(OBJDIR)/diff.o \ |
| @@ -877,10 +891,11 @@ | |
| 877 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe) |
| 878 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe) |
| 879 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe) |
| 880 | MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe) |
| 881 | MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe) |
| 882 | CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe) |
| 883 | CAT = type |
| 884 | CP = copy |
| 885 | GREP = find |
| 886 | MV = copy |
| @@ -891,10 +906,11 @@ | |
| 891 | TRANSLATE = $(OBJDIR)/translate.exe |
| 892 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 893 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 894 | MKBUILTIN = $(OBJDIR)/mkbuiltin.exe |
| 895 | MKVERSION = $(OBJDIR)/mkversion.exe |
| 896 | CODECHECK1 = $(OBJDIR)/codecheck1.exe |
| 897 | CAT = cat |
| 898 | CP = cp |
| 899 | GREP = grep |
| 900 | MV = mv |
| @@ -903,11 +919,11 @@ | |
| 903 | RMDIR = rm -rf |
| 904 | endif |
| 905 | |
| 906 | all: $(OBJDIR) $(APPNAME) |
| 907 | |
| 908 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 909 | ifdef USE_WINDOWS |
| 910 | $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h) |
| 911 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR)) |
| 912 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR)) |
| 913 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR)) |
| @@ -948,10 +964,13 @@ | |
| 948 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 949 | |
| 950 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 951 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 952 | |
| 953 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 954 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 955 | |
| 956 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 957 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| @@ -959,10 +978,13 @@ | |
| 959 | test: $(OBJDIR) $(APPNAME) |
| 960 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 961 | |
| 962 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 963 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 964 | |
| 965 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 966 | # to 1. If it is set to 1, then there is no need to build or link |
| 967 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 968 | # using -lsqlite3. |
| @@ -1072,11 +1094,11 @@ | |
| 1072 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 1073 | |
| 1074 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 1075 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 1076 | |
| 1077 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 1078 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 1079 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 1080 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 1081 | $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \ |
| 1082 | $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \ |
| @@ -1093,10 +1115,11 @@ | |
| 1093 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1094 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1095 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1096 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1097 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1098 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| 1099 | $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \ |
| 1100 | $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \ |
| 1101 | $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \ |
| 1102 | $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \ |
| @@ -1367,10 +1390,18 @@ | |
| 1367 | |
| 1368 | $(OBJDIR)/content.o: $(OBJDIR)/content_.c $(OBJDIR)/content.h $(SRCDIR)/config.h |
| 1369 | $(XTCC) -o $(OBJDIR)/content.o -c $(OBJDIR)/content_.c |
| 1370 | |
| 1371 | $(OBJDIR)/content.h: $(OBJDIR)/headers |
| 1372 | |
| 1373 | $(OBJDIR)/db_.c: $(SRCDIR)/db.c $(TRANSLATE) |
| 1374 | $(TRANSLATE) $(SRCDIR)/db.c >$@ |
| 1375 | |
| 1376 | $(OBJDIR)/db.o: $(OBJDIR)/db_.c $(OBJDIR)/db.h $(SRCDIR)/config.h |
| @@ -2011,11 +2042,11 @@ | |
| 2011 | $(OBJDIR)/statrep.h: $(OBJDIR)/headers |
| 2012 | |
| 2013 | $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE) |
| 2014 | $(TRANSLATE) $(SRCDIR)/style.c >$@ |
| 2015 | |
| 2016 | $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h |
| 2017 | $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c |
| 2018 | |
| 2019 | $(OBJDIR)/style.h: $(OBJDIR)/headers |
| 2020 | |
| 2021 | $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE) |
| 2022 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -442,10 +442,11 @@ | |
| 442 | $(SRCDIR)/clearsign.c \ |
| 443 | $(SRCDIR)/clone.c \ |
| 444 | $(SRCDIR)/comformat.c \ |
| 445 | $(SRCDIR)/configure.c \ |
| 446 | $(SRCDIR)/content.c \ |
| 447 | $(SRCDIR)/cookies.c \ |
| 448 | $(SRCDIR)/db.c \ |
| 449 | $(SRCDIR)/delta.c \ |
| 450 | $(SRCDIR)/deltacmd.c \ |
| 451 | $(SRCDIR)/descendants.c \ |
| 452 | $(SRCDIR)/diff.c \ |
| @@ -601,12 +602,23 @@ | |
| 602 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 603 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 604 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 605 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 606 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 607 | $(SRCDIR)/ci_edit.js \ |
| 608 | $(SRCDIR)/diff.tcl \ |
| 609 | $(SRCDIR)/graph.js \ |
| 610 | $(SRCDIR)/href.js \ |
| 611 | $(SRCDIR)/login.js \ |
| 612 | $(SRCDIR)/markdown.md \ |
| 613 | $(SRCDIR)/menu.js \ |
| 614 | $(SRCDIR)/sbsdiff.js \ |
| 615 | $(SRCDIR)/scroll.js \ |
| 616 | $(SRCDIR)/skin.js \ |
| 617 | $(SRCDIR)/sorttable.js \ |
| 618 | $(SRCDIR)/tree.js \ |
| 619 | $(SRCDIR)/useredit.js \ |
| 620 | $(SRCDIR)/wiki.wiki |
| 621 | |
| 622 | TRANS_SRC = \ |
| 623 | $(OBJDIR)/add_.c \ |
| 624 | $(OBJDIR)/allrepo_.c \ |
| @@ -626,10 +638,11 @@ | |
| 638 | $(OBJDIR)/clearsign_.c \ |
| 639 | $(OBJDIR)/clone_.c \ |
| 640 | $(OBJDIR)/comformat_.c \ |
| 641 | $(OBJDIR)/configure_.c \ |
| 642 | $(OBJDIR)/content_.c \ |
| 643 | $(OBJDIR)/cookies_.c \ |
| 644 | $(OBJDIR)/db_.c \ |
| 645 | $(OBJDIR)/delta_.c \ |
| 646 | $(OBJDIR)/deltacmd_.c \ |
| 647 | $(OBJDIR)/descendants_.c \ |
| 648 | $(OBJDIR)/diff_.c \ |
| @@ -754,10 +767,11 @@ | |
| 767 | $(OBJDIR)/clearsign.o \ |
| 768 | $(OBJDIR)/clone.o \ |
| 769 | $(OBJDIR)/comformat.o \ |
| 770 | $(OBJDIR)/configure.o \ |
| 771 | $(OBJDIR)/content.o \ |
| 772 | $(OBJDIR)/cookies.o \ |
| 773 | $(OBJDIR)/db.o \ |
| 774 | $(OBJDIR)/delta.o \ |
| 775 | $(OBJDIR)/deltacmd.o \ |
| 776 | $(OBJDIR)/descendants.o \ |
| 777 | $(OBJDIR)/diff.o \ |
| @@ -877,10 +891,11 @@ | |
| 891 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe) |
| 892 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe) |
| 893 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe) |
| 894 | MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe) |
| 895 | MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe) |
| 896 | MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe) |
| 897 | CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe) |
| 898 | CAT = type |
| 899 | CP = copy |
| 900 | GREP = find |
| 901 | MV = copy |
| @@ -891,10 +906,11 @@ | |
| 906 | TRANSLATE = $(OBJDIR)/translate.exe |
| 907 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 908 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 909 | MKBUILTIN = $(OBJDIR)/mkbuiltin.exe |
| 910 | MKVERSION = $(OBJDIR)/mkversion.exe |
| 911 | MKCSS = $(OBJDIR)/mkcss.exe |
| 912 | CODECHECK1 = $(OBJDIR)/codecheck1.exe |
| 913 | CAT = cat |
| 914 | CP = cp |
| 915 | GREP = grep |
| 916 | MV = mv |
| @@ -903,11 +919,11 @@ | |
| 919 | RMDIR = rm -rf |
| 920 | endif |
| 921 | |
| 922 | all: $(OBJDIR) $(APPNAME) |
| 923 | |
| 924 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h |
| 925 | ifdef USE_WINDOWS |
| 926 | $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h) |
| 927 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR)) |
| 928 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR)) |
| 929 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR)) |
| @@ -948,10 +964,13 @@ | |
| 964 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 965 | |
| 966 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 967 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 968 | |
| 969 | $(MKCSS): $(SRCDIR)/mkcss.c |
| 970 | $(XBCC) -o $@ $(SRCDIR)/mkcss.c |
| 971 | |
| 972 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 973 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 974 | |
| 975 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 976 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| @@ -959,10 +978,13 @@ | |
| 978 | test: $(OBJDIR) $(APPNAME) |
| 979 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 980 | |
| 981 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 982 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 983 | |
| 984 | $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS) |
| 985 | $(MKCSS) $(SRCDIR)/default_css.txt $@ |
| 986 | |
| 987 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 988 | # to 1. If it is set to 1, then there is no need to build or link |
| 989 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 990 | # using -lsqlite3. |
| @@ -1072,11 +1094,11 @@ | |
| 1094 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 1095 | |
| 1096 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 1097 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 1098 | |
| 1099 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 1100 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 1101 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 1102 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 1103 | $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \ |
| 1104 | $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \ |
| @@ -1093,10 +1115,11 @@ | |
| 1115 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1116 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1117 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1118 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1119 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1120 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1121 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| 1122 | $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \ |
| 1123 | $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \ |
| 1124 | $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \ |
| 1125 | $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \ |
| @@ -1367,10 +1390,18 @@ | |
| 1390 | |
| 1391 | $(OBJDIR)/content.o: $(OBJDIR)/content_.c $(OBJDIR)/content.h $(SRCDIR)/config.h |
| 1392 | $(XTCC) -o $(OBJDIR)/content.o -c $(OBJDIR)/content_.c |
| 1393 | |
| 1394 | $(OBJDIR)/content.h: $(OBJDIR)/headers |
| 1395 | |
| 1396 | $(OBJDIR)/cookies_.c: $(SRCDIR)/cookies.c $(TRANSLATE) |
| 1397 | $(TRANSLATE) $(SRCDIR)/cookies.c >$@ |
| 1398 | |
| 1399 | $(OBJDIR)/cookies.o: $(OBJDIR)/cookies_.c $(OBJDIR)/cookies.h $(SRCDIR)/config.h |
| 1400 | $(XTCC) -o $(OBJDIR)/cookies.o -c $(OBJDIR)/cookies_.c |
| 1401 | |
| 1402 | $(OBJDIR)/cookies.h: $(OBJDIR)/headers |
| 1403 | |
| 1404 | $(OBJDIR)/db_.c: $(SRCDIR)/db.c $(TRANSLATE) |
| 1405 | $(TRANSLATE) $(SRCDIR)/db.c >$@ |
| 1406 | |
| 1407 | $(OBJDIR)/db.o: $(OBJDIR)/db_.c $(OBJDIR)/db.h $(SRCDIR)/config.h |
| @@ -2011,11 +2042,11 @@ | |
| 2042 | $(OBJDIR)/statrep.h: $(OBJDIR)/headers |
| 2043 | |
| 2044 | $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE) |
| 2045 | $(TRANSLATE) $(SRCDIR)/style.c >$@ |
| 2046 | |
| 2047 | $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h |
| 2048 | $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c |
| 2049 | |
| 2050 | $(OBJDIR)/style.h: $(OBJDIR)/headers |
| 2051 | |
| 2052 | $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE) |
| 2053 |