Fossil SCM
Update the custom MinGW makefile.
Commit
e28b23159fd3255edf946c2a2013431e762ec644e56e56c3c2ffa64eb2dbe8b8
Parent
6daa19d96154868…
1 file changed
+16
-11
+16
-11
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -437,10 +437,11 @@ | ||
| 437 | 437 | XBCC = $(BCC) $(CFLAGS) |
| 438 | 438 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 439 | 439 | |
| 440 | 440 | SRC = \ |
| 441 | 441 | $(SRCDIR)/add.c \ |
| 442 | + $(SRCDIR)/ajax.c \ | |
| 442 | 443 | $(SRCDIR)/alerts.c \ |
| 443 | 444 | $(SRCDIR)/allrepo.c \ |
| 444 | 445 | $(SRCDIR)/attach.c \ |
| 445 | 446 | $(SRCDIR)/backlink.c \ |
| 446 | 447 | $(SRCDIR)/backoffice.c \ |
| @@ -639,10 +640,11 @@ | ||
| 639 | 640 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 640 | 641 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 641 | 642 | $(SRCDIR)/accordion.js \ |
| 642 | 643 | $(SRCDIR)/ci_edit.js \ |
| 643 | 644 | $(SRCDIR)/copybtn.js \ |
| 645 | + $(SRCDIR)/default.css \ | |
| 644 | 646 | $(SRCDIR)/diff.tcl \ |
| 645 | 647 | $(SRCDIR)/forum.js \ |
| 646 | 648 | $(SRCDIR)/fossil.bootstrap.js \ |
| 647 | 649 | $(SRCDIR)/fossil.confirmer.js \ |
| 648 | 650 | $(SRCDIR)/fossil.dom.js \ |
| @@ -681,10 +683,11 @@ | ||
| 681 | 683 | $(SRCDIR)/useredit.js \ |
| 682 | 684 | $(SRCDIR)/wiki.wiki |
| 683 | 685 | |
| 684 | 686 | TRANS_SRC = \ |
| 685 | 687 | $(OBJDIR)/add_.c \ |
| 688 | + $(OBJDIR)/ajax_.c \ | |
| 686 | 689 | $(OBJDIR)/alerts_.c \ |
| 687 | 690 | $(OBJDIR)/allrepo_.c \ |
| 688 | 691 | $(OBJDIR)/attach_.c \ |
| 689 | 692 | $(OBJDIR)/backlink_.c \ |
| 690 | 693 | $(OBJDIR)/backoffice_.c \ |
| @@ -825,10 +828,11 @@ | ||
| 825 | 828 | $(OBJDIR)/xfersetup_.c \ |
| 826 | 829 | $(OBJDIR)/zip_.c |
| 827 | 830 | |
| 828 | 831 | OBJ = \ |
| 829 | 832 | $(OBJDIR)/add.o \ |
| 833 | + $(OBJDIR)/ajax.o \ | |
| 830 | 834 | $(OBJDIR)/alerts.o \ |
| 831 | 835 | $(OBJDIR)/allrepo.o \ |
| 832 | 836 | $(OBJDIR)/attach.o \ |
| 833 | 837 | $(OBJDIR)/backlink.o \ |
| 834 | 838 | $(OBJDIR)/backoffice.o \ |
| @@ -983,11 +987,10 @@ | ||
| 983 | 987 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe) |
| 984 | 988 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe) |
| 985 | 989 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe) |
| 986 | 990 | MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe) |
| 987 | 991 | MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe) |
| 988 | -MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe) | |
| 989 | 992 | CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe) |
| 990 | 993 | CAT = type |
| 991 | 994 | CP = copy |
| 992 | 995 | GREP = find |
| 993 | 996 | MV = copy |
| @@ -998,11 +1001,10 @@ | ||
| 998 | 1001 | TRANSLATE = $(OBJDIR)/translate.exe |
| 999 | 1002 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 1000 | 1003 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 1001 | 1004 | MKBUILTIN = $(OBJDIR)/mkbuiltin.exe |
| 1002 | 1005 | MKVERSION = $(OBJDIR)/mkversion.exe |
| 1003 | -MKCSS = $(OBJDIR)/mkcss.exe | |
| 1004 | 1006 | CODECHECK1 = $(OBJDIR)/codecheck1.exe |
| 1005 | 1007 | CAT = cat |
| 1006 | 1008 | CP = cp |
| 1007 | 1009 | GREP = grep |
| 1008 | 1010 | MV = mv |
| @@ -1011,11 +1013,11 @@ | ||
| 1011 | 1013 | RMDIR = rm -rf |
| 1012 | 1014 | endif |
| 1013 | 1015 | |
| 1014 | 1016 | all: $(OBJDIR) $(APPNAME) |
| 1015 | 1017 | |
| 1016 | -$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h | |
| 1018 | +$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h | |
| 1017 | 1019 | ifdef USE_WINDOWS |
| 1018 | 1020 | $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h) |
| 1019 | 1021 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR)) |
| 1020 | 1022 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR)) |
| 1021 | 1023 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR)) |
| @@ -1056,13 +1058,10 @@ | ||
| 1056 | 1058 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 1057 | 1059 | |
| 1058 | 1060 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 1059 | 1061 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 1060 | 1062 | |
| 1061 | -$(MKCSS): $(SRCDIR)/mkcss.c | |
| 1062 | - $(XBCC) -o $@ $(SRCDIR)/mkcss.c | |
| 1063 | - | |
| 1064 | 1063 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 1065 | 1064 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 1066 | 1065 | |
| 1067 | 1066 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 1068 | 1067 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| @@ -1071,13 +1070,10 @@ | ||
| 1071 | 1070 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 1072 | 1071 | |
| 1073 | 1072 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 1074 | 1073 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 1075 | 1074 | |
| 1076 | -$(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS) | |
| 1077 | - $(MKCSS) $(SRCDIR)/default_css.txt $@ | |
| 1078 | - | |
| 1079 | 1075 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 1080 | 1076 | # to 1. If it is set to 1, then there is no need to build or link |
| 1081 | 1077 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 1082 | 1078 | # using -lsqlite3. |
| 1083 | 1079 | SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o |
| @@ -1187,12 +1183,13 @@ | ||
| 1187 | 1183 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 1188 | 1184 | |
| 1189 | 1185 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 1190 | 1186 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 1191 | 1187 | |
| 1192 | -$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h | |
| 1188 | +$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h | |
| 1193 | 1189 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 1190 | + $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \ | |
| 1194 | 1191 | $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \ |
| 1195 | 1192 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 1196 | 1193 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 1197 | 1194 | $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \ |
| 1198 | 1195 | $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \ |
| @@ -1346,10 +1343,18 @@ | ||
| 1346 | 1343 | |
| 1347 | 1344 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 1348 | 1345 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 1349 | 1346 | |
| 1350 | 1347 | $(OBJDIR)/add.h: $(OBJDIR)/headers |
| 1348 | + | |
| 1349 | +$(OBJDIR)/ajax_.c: $(SRCDIR)/ajax.c $(TRANSLATE) | |
| 1350 | + $(TRANSLATE) $(SRCDIR)/ajax.c >$@ | |
| 1351 | + | |
| 1352 | +$(OBJDIR)/ajax.o: $(OBJDIR)/ajax_.c $(OBJDIR)/ajax.h $(SRCDIR)/config.h | |
| 1353 | + $(XTCC) -o $(OBJDIR)/ajax.o -c $(OBJDIR)/ajax_.c | |
| 1354 | + | |
| 1355 | +$(OBJDIR)/ajax.h: $(OBJDIR)/headers | |
| 1351 | 1356 | |
| 1352 | 1357 | $(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE) |
| 1353 | 1358 | $(TRANSLATE) $(SRCDIR)/alerts.c >$@ |
| 1354 | 1359 | |
| 1355 | 1360 | $(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h |
| @@ -2254,11 +2259,11 @@ | ||
| 2254 | 2259 | $(OBJDIR)/statrep.h: $(OBJDIR)/headers |
| 2255 | 2260 | |
| 2256 | 2261 | $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE) |
| 2257 | 2262 | $(TRANSLATE) $(SRCDIR)/style.c >$@ |
| 2258 | 2263 | |
| 2259 | -$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h | |
| 2264 | +$(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h | |
| 2260 | 2265 | $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c |
| 2261 | 2266 | |
| 2262 | 2267 | $(OBJDIR)/style.h: $(OBJDIR)/headers |
| 2263 | 2268 | |
| 2264 | 2269 | $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE) |
| 2265 | 2270 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -437,10 +437,11 @@ | |
| 437 | XBCC = $(BCC) $(CFLAGS) |
| 438 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 439 | |
| 440 | SRC = \ |
| 441 | $(SRCDIR)/add.c \ |
| 442 | $(SRCDIR)/alerts.c \ |
| 443 | $(SRCDIR)/allrepo.c \ |
| 444 | $(SRCDIR)/attach.c \ |
| 445 | $(SRCDIR)/backlink.c \ |
| 446 | $(SRCDIR)/backoffice.c \ |
| @@ -639,10 +640,11 @@ | |
| 639 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 640 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 641 | $(SRCDIR)/accordion.js \ |
| 642 | $(SRCDIR)/ci_edit.js \ |
| 643 | $(SRCDIR)/copybtn.js \ |
| 644 | $(SRCDIR)/diff.tcl \ |
| 645 | $(SRCDIR)/forum.js \ |
| 646 | $(SRCDIR)/fossil.bootstrap.js \ |
| 647 | $(SRCDIR)/fossil.confirmer.js \ |
| 648 | $(SRCDIR)/fossil.dom.js \ |
| @@ -681,10 +683,11 @@ | |
| 681 | $(SRCDIR)/useredit.js \ |
| 682 | $(SRCDIR)/wiki.wiki |
| 683 | |
| 684 | TRANS_SRC = \ |
| 685 | $(OBJDIR)/add_.c \ |
| 686 | $(OBJDIR)/alerts_.c \ |
| 687 | $(OBJDIR)/allrepo_.c \ |
| 688 | $(OBJDIR)/attach_.c \ |
| 689 | $(OBJDIR)/backlink_.c \ |
| 690 | $(OBJDIR)/backoffice_.c \ |
| @@ -825,10 +828,11 @@ | |
| 825 | $(OBJDIR)/xfersetup_.c \ |
| 826 | $(OBJDIR)/zip_.c |
| 827 | |
| 828 | OBJ = \ |
| 829 | $(OBJDIR)/add.o \ |
| 830 | $(OBJDIR)/alerts.o \ |
| 831 | $(OBJDIR)/allrepo.o \ |
| 832 | $(OBJDIR)/attach.o \ |
| 833 | $(OBJDIR)/backlink.o \ |
| 834 | $(OBJDIR)/backoffice.o \ |
| @@ -983,11 +987,10 @@ | |
| 983 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe) |
| 984 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe) |
| 985 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe) |
| 986 | MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe) |
| 987 | MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe) |
| 988 | MKCSS = $(subst /,\,$(OBJDIR)/mkcss.exe) |
| 989 | CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe) |
| 990 | CAT = type |
| 991 | CP = copy |
| 992 | GREP = find |
| 993 | MV = copy |
| @@ -998,11 +1001,10 @@ | |
| 998 | TRANSLATE = $(OBJDIR)/translate.exe |
| 999 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 1000 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 1001 | MKBUILTIN = $(OBJDIR)/mkbuiltin.exe |
| 1002 | MKVERSION = $(OBJDIR)/mkversion.exe |
| 1003 | MKCSS = $(OBJDIR)/mkcss.exe |
| 1004 | CODECHECK1 = $(OBJDIR)/codecheck1.exe |
| 1005 | CAT = cat |
| 1006 | CP = cp |
| 1007 | GREP = grep |
| 1008 | MV = mv |
| @@ -1011,11 +1013,11 @@ | |
| 1011 | RMDIR = rm -rf |
| 1012 | endif |
| 1013 | |
| 1014 | all: $(OBJDIR) $(APPNAME) |
| 1015 | |
| 1016 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/default_css.h |
| 1017 | ifdef USE_WINDOWS |
| 1018 | $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h) |
| 1019 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR)) |
| 1020 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR)) |
| 1021 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR)) |
| @@ -1056,13 +1058,10 @@ | |
| 1056 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 1057 | |
| 1058 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 1059 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 1060 | |
| 1061 | $(MKCSS): $(SRCDIR)/mkcss.c |
| 1062 | $(XBCC) -o $@ $(SRCDIR)/mkcss.c |
| 1063 | |
| 1064 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 1065 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 1066 | |
| 1067 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 1068 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| @@ -1071,13 +1070,10 @@ | |
| 1071 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 1072 | |
| 1073 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 1074 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 1075 | |
| 1076 | $(OBJDIR)/default_css.h: $(SRCDIR)/default_css.txt $(MKCSS) |
| 1077 | $(MKCSS) $(SRCDIR)/default_css.txt $@ |
| 1078 | |
| 1079 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 1080 | # to 1. If it is set to 1, then there is no need to build or link |
| 1081 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 1082 | # using -lsqlite3. |
| 1083 | SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o |
| @@ -1187,12 +1183,13 @@ | |
| 1187 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 1188 | |
| 1189 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 1190 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 1191 | |
| 1192 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 1193 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 1194 | $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \ |
| 1195 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 1196 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 1197 | $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \ |
| 1198 | $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \ |
| @@ -1346,10 +1343,18 @@ | |
| 1346 | |
| 1347 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 1348 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 1349 | |
| 1350 | $(OBJDIR)/add.h: $(OBJDIR)/headers |
| 1351 | |
| 1352 | $(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE) |
| 1353 | $(TRANSLATE) $(SRCDIR)/alerts.c >$@ |
| 1354 | |
| 1355 | $(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h |
| @@ -2254,11 +2259,11 @@ | |
| 2254 | $(OBJDIR)/statrep.h: $(OBJDIR)/headers |
| 2255 | |
| 2256 | $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE) |
| 2257 | $(TRANSLATE) $(SRCDIR)/style.c >$@ |
| 2258 | |
| 2259 | $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(OBJDIR)/default_css.h $(SRCDIR)/config.h |
| 2260 | $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c |
| 2261 | |
| 2262 | $(OBJDIR)/style.h: $(OBJDIR)/headers |
| 2263 | |
| 2264 | $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE) |
| 2265 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -437,10 +437,11 @@ | |
| 437 | XBCC = $(BCC) $(CFLAGS) |
| 438 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 439 | |
| 440 | SRC = \ |
| 441 | $(SRCDIR)/add.c \ |
| 442 | $(SRCDIR)/ajax.c \ |
| 443 | $(SRCDIR)/alerts.c \ |
| 444 | $(SRCDIR)/allrepo.c \ |
| 445 | $(SRCDIR)/attach.c \ |
| 446 | $(SRCDIR)/backlink.c \ |
| 447 | $(SRCDIR)/backoffice.c \ |
| @@ -639,10 +640,11 @@ | |
| 640 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 641 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 642 | $(SRCDIR)/accordion.js \ |
| 643 | $(SRCDIR)/ci_edit.js \ |
| 644 | $(SRCDIR)/copybtn.js \ |
| 645 | $(SRCDIR)/default.css \ |
| 646 | $(SRCDIR)/diff.tcl \ |
| 647 | $(SRCDIR)/forum.js \ |
| 648 | $(SRCDIR)/fossil.bootstrap.js \ |
| 649 | $(SRCDIR)/fossil.confirmer.js \ |
| 650 | $(SRCDIR)/fossil.dom.js \ |
| @@ -681,10 +683,11 @@ | |
| 683 | $(SRCDIR)/useredit.js \ |
| 684 | $(SRCDIR)/wiki.wiki |
| 685 | |
| 686 | TRANS_SRC = \ |
| 687 | $(OBJDIR)/add_.c \ |
| 688 | $(OBJDIR)/ajax_.c \ |
| 689 | $(OBJDIR)/alerts_.c \ |
| 690 | $(OBJDIR)/allrepo_.c \ |
| 691 | $(OBJDIR)/attach_.c \ |
| 692 | $(OBJDIR)/backlink_.c \ |
| 693 | $(OBJDIR)/backoffice_.c \ |
| @@ -825,10 +828,11 @@ | |
| 828 | $(OBJDIR)/xfersetup_.c \ |
| 829 | $(OBJDIR)/zip_.c |
| 830 | |
| 831 | OBJ = \ |
| 832 | $(OBJDIR)/add.o \ |
| 833 | $(OBJDIR)/ajax.o \ |
| 834 | $(OBJDIR)/alerts.o \ |
| 835 | $(OBJDIR)/allrepo.o \ |
| 836 | $(OBJDIR)/attach.o \ |
| 837 | $(OBJDIR)/backlink.o \ |
| 838 | $(OBJDIR)/backoffice.o \ |
| @@ -983,11 +987,10 @@ | |
| 987 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe) |
| 988 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe) |
| 989 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe) |
| 990 | MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe) |
| 991 | MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe) |
| 992 | CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe) |
| 993 | CAT = type |
| 994 | CP = copy |
| 995 | GREP = find |
| 996 | MV = copy |
| @@ -998,11 +1001,10 @@ | |
| 1001 | TRANSLATE = $(OBJDIR)/translate.exe |
| 1002 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 1003 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 1004 | MKBUILTIN = $(OBJDIR)/mkbuiltin.exe |
| 1005 | MKVERSION = $(OBJDIR)/mkversion.exe |
| 1006 | CODECHECK1 = $(OBJDIR)/codecheck1.exe |
| 1007 | CAT = cat |
| 1008 | CP = cp |
| 1009 | GREP = grep |
| 1010 | MV = mv |
| @@ -1011,11 +1013,11 @@ | |
| 1013 | RMDIR = rm -rf |
| 1014 | endif |
| 1015 | |
| 1016 | all: $(OBJDIR) $(APPNAME) |
| 1017 | |
| 1018 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 1019 | ifdef USE_WINDOWS |
| 1020 | $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h) |
| 1021 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR)) |
| 1022 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR)) |
| 1023 | $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR)) |
| @@ -1056,13 +1058,10 @@ | |
| 1058 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 1059 | |
| 1060 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 1061 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 1062 | |
| 1063 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 1064 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 1065 | |
| 1066 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 1067 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| @@ -1071,13 +1070,10 @@ | |
| 1070 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 1071 | |
| 1072 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) |
| 1073 | $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@ |
| 1074 | |
| 1075 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 1076 | # to 1. If it is set to 1, then there is no need to build or link |
| 1077 | # the sqlite3.o object. Instead, the system SQLite will be linked |
| 1078 | # using -lsqlite3. |
| 1079 | SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o |
| @@ -1187,12 +1183,13 @@ | |
| 1183 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 1184 | |
| 1185 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 1186 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 1187 | |
| 1188 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 1189 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 1190 | $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \ |
| 1191 | $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \ |
| 1192 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 1193 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 1194 | $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \ |
| 1195 | $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \ |
| @@ -1346,10 +1343,18 @@ | |
| 1343 | |
| 1344 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 1345 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 1346 | |
| 1347 | $(OBJDIR)/add.h: $(OBJDIR)/headers |
| 1348 | |
| 1349 | $(OBJDIR)/ajax_.c: $(SRCDIR)/ajax.c $(TRANSLATE) |
| 1350 | $(TRANSLATE) $(SRCDIR)/ajax.c >$@ |
| 1351 | |
| 1352 | $(OBJDIR)/ajax.o: $(OBJDIR)/ajax_.c $(OBJDIR)/ajax.h $(SRCDIR)/config.h |
| 1353 | $(XTCC) -o $(OBJDIR)/ajax.o -c $(OBJDIR)/ajax_.c |
| 1354 | |
| 1355 | $(OBJDIR)/ajax.h: $(OBJDIR)/headers |
| 1356 | |
| 1357 | $(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE) |
| 1358 | $(TRANSLATE) $(SRCDIR)/alerts.c >$@ |
| 1359 | |
| 1360 | $(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h |
| @@ -2254,11 +2259,11 @@ | |
| 2259 | $(OBJDIR)/statrep.h: $(OBJDIR)/headers |
| 2260 | |
| 2261 | $(OBJDIR)/style_.c: $(SRCDIR)/style.c $(TRANSLATE) |
| 2262 | $(TRANSLATE) $(SRCDIR)/style.c >$@ |
| 2263 | |
| 2264 | $(OBJDIR)/style.o: $(OBJDIR)/style_.c $(OBJDIR)/style.h $(SRCDIR)/config.h |
| 2265 | $(XTCC) -o $(OBJDIR)/style.o -c $(OBJDIR)/style_.c |
| 2266 | |
| 2267 | $(OBJDIR)/style.h: $(OBJDIR)/headers |
| 2268 | |
| 2269 | $(OBJDIR)/sync_.c: $(SRCDIR)/sync.c $(TRANSLATE) |
| 2270 |