Fossil SCM

Make sure that shell.o and sqlite3.o are rebuilt whenever compilation options change. This should prevent problems like [http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/14805|Problem with compilation under MINGW] once and for all.

jan.nijtmans 2014-01-07 09:03 UTC trunk
Commit 1ab27288206bc8a749977d701666227d93bb441a
Parent 6f1b5d6047b39e0…
5 files changed +2 -2 +7 -7 +2 -2 +2 -2 +3 -3
~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/main.mk
+2 -2
--- src/main.mk
+++ src/main.mk
@@ -1182,14 +1182,14 @@
11821182
11831183
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
11841184
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
11851185
11861186
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1187
-$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1187
+$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c autoconfig.h
11881188
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
11891189
1190
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1190
+$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h autoconfig.h
11911191
 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11921192
11931193
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11941194
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
11951195
11961196
--- src/main.mk
+++ src/main.mk
@@ -1182,14 +1182,14 @@
1182
1183 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1184 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1185
1186 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1187 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1188 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1189
1190 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1191 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1192
1193 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1194 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1195
1196
--- src/main.mk
+++ src/main.mk
@@ -1182,14 +1182,14 @@
1182
1183 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1184 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1185
1186 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1187 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c autoconfig.h
1188 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1189
1190 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h autoconfig.h
1191 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1192
1193 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1194 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1195
1196
M src/makemake.tcl
+7 -7
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -320,14 +320,14 @@
320320
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
321321
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
322322
 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
323323
 }
324324
325
-writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
325
+writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c autoconfig.h"
326326
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
327327
328
-writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
328
+writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h autoconfig.h"
329329
 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
330330
331331
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
332332
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
333333
@@ -804,18 +804,18 @@
804804
 set j " \\\n "
805805
 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
806806
 set j " \\\n "
807807
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
808808
809
-writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
809
+writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c win/Makefile.mingw"
810810
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
811811
812812
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
813813
 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
814814
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
815815
816
-writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
816
+writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h win/Makefile.mingw"
817817
 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
818818
819819
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
820820
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
821821
@@ -1128,15 +1128,15 @@
11281128
 $(BCC) $**
11291129
11301130
 mkversion$E: $B\src\mkversion.c
11311131
 $(BCC) $**
11321132
1133
-$(OX)\shell$O : $(SRCDIR)\shell.c
1133
+$(OX)\shell$O : $(SRCDIR)\shell.c Makefile.msc
11341134
 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
11351135
1136
-$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1137
- $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
1136
+$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c Makefile.msc
1137
+ $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SRCDIR)\sqlite3.c
11381138
11391139
 $(OX)\th$O : $(SRCDIR)\th.c
11401140
 $(TCC) /Fo$@ -c $**
11411141
11421142
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
11431143
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -320,14 +320,14 @@
320 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
321 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
322 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
323 }
324
325 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
326 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
327
328 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
329 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
330
331 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
332 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
333
@@ -804,18 +804,18 @@
804 set j " \\\n "
805 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
806 set j " \\\n "
807 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
808
809 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
810 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
811
812 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
813 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
814 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
815
816 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
817 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
818
819 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
820 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
821
@@ -1128,15 +1128,15 @@
1128 $(BCC) $**
1129
1130 mkversion$E: $B\src\mkversion.c
1131 $(BCC) $**
1132
1133 $(OX)\shell$O : $(SRCDIR)\shell.c
1134 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
1135
1136 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1137 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
1138
1139 $(OX)\th$O : $(SRCDIR)\th.c
1140 $(TCC) /Fo$@ -c $**
1141
1142 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1143
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -320,14 +320,14 @@
320 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
321 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
322 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
323 }
324
325 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c autoconfig.h"
326 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
327
328 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h autoconfig.h"
329 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
330
331 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
332 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
333
@@ -804,18 +804,18 @@
804 set j " \\\n "
805 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
806 set j " \\\n "
807 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
808
809 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c win/Makefile.mingw"
810 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
811
812 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
813 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
814 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
815
816 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h win/Makefile.mingw"
817 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
818
819 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
820 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
821
@@ -1128,15 +1128,15 @@
1128 $(BCC) $**
1129
1130 mkversion$E: $B\src\mkversion.c
1131 $(BCC) $**
1132
1133 $(OX)\shell$O : $(SRCDIR)\shell.c Makefile.msc
1134 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
1135
1136 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c Makefile.msc
1137 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SRCDIR)\sqlite3.c
1138
1139 $(OX)\th$O : $(SRCDIR)\th.c
1140 $(TCC) /Fo$@ -c $**
1141
1142 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1143
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1714,19 +1714,19 @@
17141714
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17151715
 -Dsqlite3_strglob=strglob \
17161716
 -Dgetenv=fossil_getenv \
17171717
 -Dfopen=fossil_fopen
17181718
1719
-$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1719
+$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
17201720
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
17211721
17221722
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
17231723
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
17241724
17251725
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
17261726
1727
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1727
+$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h win/Makefile.mingw
17281728
 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
17291729
17301730
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
17311731
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17321732
17331733
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1714,19 +1714,19 @@
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715 -Dsqlite3_strglob=strglob \
1716 -Dgetenv=fossil_getenv \
1717 -Dfopen=fossil_fopen
1718
1719 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1720 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721
1722 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1723 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1724
1725 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1726
1727 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1728 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1729
1730 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1731 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1732
1733
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1714,19 +1714,19 @@
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715 -Dsqlite3_strglob=strglob \
1716 -Dgetenv=fossil_getenv \
1717 -Dfopen=fossil_fopen
1718
1719 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
1720 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721
1722 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1723 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1724
1725 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1726
1727 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h win/Makefile.mingw
1728 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1729
1730 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1731 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1732
1733
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1714,19 +1714,19 @@
17141714
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17151715
 -Dsqlite3_strglob=strglob \
17161716
 -Dgetenv=fossil_getenv \
17171717
 -Dfopen=fossil_fopen
17181718
1719
-$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1719
+$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
17201720
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
17211721
17221722
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
17231723
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
17241724
17251725
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
17261726
1727
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1727
+$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h win/Makefile.mingw.mistachkin
17281728
 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
17291729
17301730
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
17311731
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17321732
17331733
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1714,19 +1714,19 @@
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715 -Dsqlite3_strglob=strglob \
1716 -Dgetenv=fossil_getenv \
1717 -Dfopen=fossil_fopen
1718
1719 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1720 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721
1722 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1723 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1724
1725 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1726
1727 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1728 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1729
1730 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1731 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1732
1733
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1714,19 +1714,19 @@
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715 -Dsqlite3_strglob=strglob \
1716 -Dgetenv=fossil_getenv \
1717 -Dfopen=fossil_fopen
1718
1719 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
1720 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721
1722 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1723 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1724
1725 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1726
1727 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h win/Makefile.mingw.mistachkin
1728 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1729
1730 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1731 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1732
1733
M win/Makefile.msc
+3 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -449,15 +449,15 @@
449449
 $(BCC) $**
450450
451451
 mkversion$E: $B\src\mkversion.c
452452
 $(BCC) $**
453453
454
-$(OX)\shell$O : $(SRCDIR)\shell.c
454
+$(OX)\shell$O : $(SRCDIR)\shell.c Makefile.msc
455455
 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
456456
457
-$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
458
- $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
457
+$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c Makefile.msc
458
+ $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SRCDIR)\sqlite3.c
459459
460460
 $(OX)\th$O : $(SRCDIR)\th.c
461461
 $(TCC) /Fo$@ -c $**
462462
463463
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
464464
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -449,15 +449,15 @@
449 $(BCC) $**
450
451 mkversion$E: $B\src\mkversion.c
452 $(BCC) $**
453
454 $(OX)\shell$O : $(SRCDIR)\shell.c
455 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
456
457 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
458 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
459
460 $(OX)\th$O : $(SRCDIR)\th.c
461 $(TCC) /Fo$@ -c $**
462
463 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
464
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -449,15 +449,15 @@
449 $(BCC) $**
450
451 mkversion$E: $B\src\mkversion.c
452 $(BCC) $**
453
454 $(OX)\shell$O : $(SRCDIR)\shell.c Makefile.msc
455 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
456
457 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c Makefile.msc
458 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SRCDIR)\sqlite3.c
459
460 $(OX)\th$O : $(SRCDIR)\th.c
461 $(TCC) /Fo$@ -c $**
462
463 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
464

Keyboard Shortcuts

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