Fossil SCM

Merge changes from the broken-build branch into trunk (after fixing the build).

drh 2014-01-07 10:16 trunk merge
Commit de86ef41b2ce1ca279c8c17f6a7245be45556404
Parent 6f1b5d6047b39e0…
6 files changed +3 -2 +5 -5 +16 -29 +2 -2 +2 -2 +3 -3
~ src/browse.c ~ src/makemake.tcl ~ src/style.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/browse.c
+3 -2
--- src/browse.c
+++ src/browse.c
@@ -620,19 +620,20 @@
620620
 @ lists[i].style.display = display;
621621
 @ }
622622
 @ }
623623
 @
624624
 @ var outer_ul = document.querySelector('.filetree > ul');
625
+ @ var subdir = outer_ul.querySelector('.subdir');
625626
 @ outer_ul.querySelector('.subdir > a').style.cursor = 'pointer';
626627
 @ outer_ul.onclick = function( e ){
627628
 @ var a = e.target;
628629
 @ if( a.nodeName!='A' ) return;
629
- @ if( a.parentNode.className.indexOf('subdir')>=0 ){
630
+ @ if( a.parentNode==subdir ){
630631
 @ toggleAll(outer_ul);
631632
 @ return false;
632633
 @ }
633
- @ if( style(a.parentNode, 'display')=='inline' ) return;
634
+ @ if( !subdir.contains(a) ) return;
634635
 @ var ul = a.nextSibling;
635636
 @ while( ul && ul.nodeName!='UL' ) ul = ul.nextSibling;
636637
 @ ul.style.display = style(ul, 'display')=='none' ? 'block' : 'none';
637638
 @ return false;
638639
 @ }
639640
--- src/browse.c
+++ src/browse.c
@@ -620,19 +620,20 @@
620 @ lists[i].style.display = display;
621 @ }
622 @ }
623 @
624 @ var outer_ul = document.querySelector('.filetree > ul');
 
625 @ outer_ul.querySelector('.subdir > a').style.cursor = 'pointer';
626 @ outer_ul.onclick = function( e ){
627 @ var a = e.target;
628 @ if( a.nodeName!='A' ) return;
629 @ if( a.parentNode.className.indexOf('subdir')>=0 ){
630 @ toggleAll(outer_ul);
631 @ return false;
632 @ }
633 @ if( style(a.parentNode, 'display')=='inline' ) return;
634 @ var ul = a.nextSibling;
635 @ while( ul && ul.nodeName!='UL' ) ul = ul.nextSibling;
636 @ ul.style.display = style(ul, 'display')=='none' ? 'block' : 'none';
637 @ return false;
638 @ }
639
--- src/browse.c
+++ src/browse.c
@@ -620,19 +620,20 @@
620 @ lists[i].style.display = display;
621 @ }
622 @ }
623 @
624 @ var outer_ul = document.querySelector('.filetree > ul');
625 @ var subdir = outer_ul.querySelector('.subdir');
626 @ outer_ul.querySelector('.subdir > a').style.cursor = 'pointer';
627 @ outer_ul.onclick = function( e ){
628 @ var a = e.target;
629 @ if( a.nodeName!='A' ) return;
630 @ if( a.parentNode==subdir ){
631 @ toggleAll(outer_ul);
632 @ return false;
633 @ }
634 @ if( !subdir.contains(a) ) return;
635 @ var ul = a.nextSibling;
636 @ while( ul && ul.nodeName!='UL' ) ul = ul.nextSibling;
637 @ ul.style.display = style(ul, 'display')=='none' ? 'block' : 'none';
638 @ return false;
639 @ }
640
M src/makemake.tcl
+5 -5
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -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
@@ -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
@@ -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 src/style.c
+16 -29
--- src/style.c
+++ src/style.c
@@ -778,36 +778,24 @@
778778
 @ margin: 1em 0;
779779
 @ line-height: 1.5;
780780
 },
781781
 { ".filetree ul",
782782
 "tree-view lists",
783
- @ display: inline;
784
- @ margin: 0;
785
- @ padding: 0;
786
- },
787
- { ".filetree li",
788
- "tree-view list items",
789
- @ display: inline;
790
- },
791
- /* There is exactly one element with class="subdir". That element is
792
- ** the name of the directory specified by the "name=" query parameter,
793
- ** and the directory described by the text at the top of the page. */
794
- { ".filetree .subdir ul",
795
- "tree-view lists below subdir",
796
- @ position: relative;
797
- @ display: block;
798
- @ margin: 0 0 0 21px;
799
- @ padding: 0;
800
- },
801
- { ".filetree .subdir li",
802
- "tree-view lists items below subdir",
803
- @ position: relative;
804
- @ display: block;
805
- @ margin: 0;
806
- @ padding: 0;
807
- },
808
- { ".filetree .subdir li:before",
783
+ @ margin: 0;
784
+ @ padding: 0;
785
+ @ list-style: none;
786
+ },
787
+ { ".filetree ul ul",
788
+ "tree-view lists below the root",
789
+ @ position: relative;
790
+ @ margin: 0 0 0 21px;
791
+ },
792
+ { ".filetree li",
793
+ "tree-view lists items",
794
+ @ position: relative;
795
+ },
796
+ { ".filetree li li:before",
809797
 "tree-view node lines",
810798
 @ content: '';
811799
 @ position: absolute;
812800
 @ top: -.8em;
813801
 @ left: -14px;
@@ -814,30 +802,29 @@
814802
 @ width: 14px;
815803
 @ height: 1.5em;
816804
 @ border-left: 2px solid #aaa;
817805
 @ border-bottom: 2px solid #aaa;
818806
 },
819
- { ".filetree .subdir > ul ul:before",
807
+ { ".filetree ul ul:before",
820808
 "tree-view directory lines",
821809
 @ content: '';
822810
 @ position: absolute;
823811
 @ top: -1.5em;
824812
 @ bottom: 0;
825813
 @ left: -35px;
826814
 @ border-left: 2px solid #aaa;
827815
 },
828
- { ".filetree .subdir li:last-child > ul:before",
816
+ { ".filetree li:last-child > ul:before",
829817
 "hide lines for last-child directories",
830818
 @ display: none;
831819
 },
832820
 { ".filetree a",
833821
 "tree-view links",
834822
 @ position: relative;
835823
 @ z-index: 1;
836824
 @ display: inline-block;
837825
 @ min-height: 16px;
838
- @ margin-right: .5em;
839826
 @ padding-left: 21px;
840827
 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
841828
 @ background-position: center left;
842829
 @ background-repeat: no-repeat;
843830
 },
844831
--- src/style.c
+++ src/style.c
@@ -778,36 +778,24 @@
778 @ margin: 1em 0;
779 @ line-height: 1.5;
780 },
781 { ".filetree ul",
782 "tree-view lists",
783 @ display: inline;
784 @ margin: 0;
785 @ padding: 0;
786 },
787 { ".filetree li",
788 "tree-view list items",
789 @ display: inline;
790 },
791 /* There is exactly one element with class="subdir". That element is
792 ** the name of the directory specified by the "name=" query parameter,
793 ** and the directory described by the text at the top of the page. */
794 { ".filetree .subdir ul",
795 "tree-view lists below subdir",
796 @ position: relative;
797 @ display: block;
798 @ margin: 0 0 0 21px;
799 @ padding: 0;
800 },
801 { ".filetree .subdir li",
802 "tree-view lists items below subdir",
803 @ position: relative;
804 @ display: block;
805 @ margin: 0;
806 @ padding: 0;
807 },
808 { ".filetree .subdir li:before",
809 "tree-view node lines",
810 @ content: '';
811 @ position: absolute;
812 @ top: -.8em;
813 @ left: -14px;
@@ -814,30 +802,29 @@
814 @ width: 14px;
815 @ height: 1.5em;
816 @ border-left: 2px solid #aaa;
817 @ border-bottom: 2px solid #aaa;
818 },
819 { ".filetree .subdir > ul ul:before",
820 "tree-view directory lines",
821 @ content: '';
822 @ position: absolute;
823 @ top: -1.5em;
824 @ bottom: 0;
825 @ left: -35px;
826 @ border-left: 2px solid #aaa;
827 },
828 { ".filetree .subdir li:last-child > ul:before",
829 "hide lines for last-child directories",
830 @ display: none;
831 },
832 { ".filetree a",
833 "tree-view links",
834 @ position: relative;
835 @ z-index: 1;
836 @ display: inline-block;
837 @ min-height: 16px;
838 @ margin-right: .5em;
839 @ padding-left: 21px;
840 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
841 @ background-position: center left;
842 @ background-repeat: no-repeat;
843 },
844
--- src/style.c
+++ src/style.c
@@ -778,36 +778,24 @@
778 @ margin: 1em 0;
779 @ line-height: 1.5;
780 },
781 { ".filetree ul",
782 "tree-view lists",
783 @ margin: 0;
784 @ padding: 0;
785 @ list-style: none;
786 },
787 { ".filetree ul ul",
788 "tree-view lists below the root",
789 @ position: relative;
790 @ margin: 0 0 0 21px;
791 },
792 { ".filetree li",
793 "tree-view lists items",
794 @ position: relative;
795 },
796 { ".filetree li li:before",
 
 
 
 
 
 
 
 
 
 
 
 
797 "tree-view node lines",
798 @ content: '';
799 @ position: absolute;
800 @ top: -.8em;
801 @ left: -14px;
@@ -814,30 +802,29 @@
802 @ width: 14px;
803 @ height: 1.5em;
804 @ border-left: 2px solid #aaa;
805 @ border-bottom: 2px solid #aaa;
806 },
807 { ".filetree ul ul:before",
808 "tree-view directory lines",
809 @ content: '';
810 @ position: absolute;
811 @ top: -1.5em;
812 @ bottom: 0;
813 @ left: -35px;
814 @ border-left: 2px solid #aaa;
815 },
816 { ".filetree li:last-child > ul:before",
817 "hide lines for last-child directories",
818 @ display: none;
819 },
820 { ".filetree a",
821 "tree-view links",
822 @ position: relative;
823 @ z-index: 1;
824 @ display: inline-block;
825 @ min-height: 16px;
 
826 @ padding-left: 21px;
827 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
828 @ background-position: center left;
829 @ background-repeat: no-repeat;
830 },
831
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