Fossil SCM

Corrected the --with-see build to use sqlite3-see.c. Problem reported in [forum:b3653991172dcd14|forum post b3653991172dcd14]. The SEE build was broken by the late-December 2021 reworking of the --with-sqlite flag and its related build infrastructure.

stephan 2022-07-25 16:47 trunk
Commit 18acd94828f1db2659cf12873bebc0b7a01ce62cd2cc5d81b8f092d82914f448
Parent 5960a16f9a70692…
3 files changed +3 -2 +7 -5 +4 -3
~ src/main.mk ~ tools/makemake.tcl ~ win/Makefile.mingw
M src/main.mk
+3 -2
--- src/main.mk
+++ src/main.mk
@@ -692,13 +692,14 @@
692692
 # using -lsqlite3.
693693
 #
694694
 # Closely related is SQLITE3_ORIGIN, with the same numeric mapping plus
695695
 # a value of 2 means that we are building a client-provided sqlite3.c.
696696
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
697
-SQLITE3_OBJ.1 =
697
+SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
698698
 # SQLITE3_OBJ.2 is set by the configure process
699699
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
700
+SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
700701
701702
 # The USE_LINENOISE variable may be undefined, set to 0, or set
702703
 # to 1. If it is set to 0, then there is no need to build or link
703704
 # the linenoise.o object.
704705
 LINENOISE_DEF.0 =
@@ -2089,11 +2090,11 @@
20892090
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
20902091
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
20912092
20922093
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
20932094
2094
-$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
2095
+$(SQLITE3_OBJ): $(SQLITE3_SRC)
20952096
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
20962097
 -c $(SQLITE3_SRC) -o $@
20972098
 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h
20982099
 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
20992100
21002101
--- src/main.mk
+++ src/main.mk
@@ -692,13 +692,14 @@
692 # using -lsqlite3.
693 #
694 # Closely related is SQLITE3_ORIGIN, with the same numeric mapping plus
695 # a value of 2 means that we are building a client-provided sqlite3.c.
696 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
697 SQLITE3_OBJ.1 =
698 # SQLITE3_OBJ.2 is set by the configure process
699 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
 
700
701 # The USE_LINENOISE variable may be undefined, set to 0, or set
702 # to 1. If it is set to 0, then there is no need to build or link
703 # the linenoise.o object.
704 LINENOISE_DEF.0 =
@@ -2089,11 +2090,11 @@
2089 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
2090 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
2091
2092 $(OBJDIR)/zip.h: $(OBJDIR)/headers
2093
2094 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
2095 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2096 -c $(SQLITE3_SRC) -o $@
2097 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h
2098 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
2099
2100
--- src/main.mk
+++ src/main.mk
@@ -692,13 +692,14 @@
692 # using -lsqlite3.
693 #
694 # Closely related is SQLITE3_ORIGIN, with the same numeric mapping plus
695 # a value of 2 means that we are building a client-provided sqlite3.c.
696 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
697 SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
698 # SQLITE3_OBJ.2 is set by the configure process
699 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
700 SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
701
702 # The USE_LINENOISE variable may be undefined, set to 0, or set
703 # to 1. If it is set to 0, then there is no need to build or link
704 # the linenoise.o object.
705 LINENOISE_DEF.0 =
@@ -2089,11 +2090,11 @@
2090 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
2091 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
2092
2093 $(OBJDIR)/zip.h: $(OBJDIR)/headers
2094
2095 $(SQLITE3_OBJ): $(SQLITE3_SRC)
2096 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2097 -c $(SQLITE3_SRC) -o $@
2098 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h
2099 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
2100
2101
M tools/makemake.tcl
+7 -5
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -435,13 +435,14 @@
435435
 # using -lsqlite3.
436436
 #
437437
 # Closely related is SQLITE3_ORIGIN, with the same numeric mapping plus
438438
 # a value of 2 means that we are building a client-provided sqlite3.c.
439439
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
440
-SQLITE3_OBJ.1 =
440
+SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
441441
 # SQLITE3_OBJ.2 is set by the configure process
442442
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
443
+SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
443444
444445
 # The USE_LINENOISE variable may be undefined, set to 0, or set
445446
 # to 1. If it is set to 0, then there is no need to build or link
446447
 # the linenoise.o object.
447448
 LINENOISE_DEF.0 =
@@ -535,11 +536,11 @@
535536
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
536537
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
537538
 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers\n"
538539
 }
539540
540
-writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
541
+writeln "\$(SQLITE3_OBJ):\t\$(SQLITE3_SRC)"
541542
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
542543
 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
543544
544545
 writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h"
545546
 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
@@ -1125,13 +1126,14 @@
11251126
 #
11261127
 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
11271128
 # plus a value of 2 means that we are building a client-provided
11281129
 # sqlite3.c.
11291130
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1130
-SQLITE3_OBJ.1 =
1131
+SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
11311132
 # SQLITE3_OBJ.2 is set by the configure process
11321133
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1134
+SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
11331135
11341136
 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
11351137
 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
11361138
 # source tree) is used and extra flags are provided to enable the
11371139
 # SQLite Encryption Extension.
@@ -1142,11 +1144,11 @@
11421144
 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
11431145
 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
11441146
 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
11451147
 # SQLITE3_SHELL_SRC.2 comes from the configure process
11461148
 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1147
-SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1149
+SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
11481150
 SEE_FLAGS.0 =
11491151
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
11501152
 SEE_FLAGS. =
11511153
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
11521154
 }
@@ -1277,11 +1279,11 @@
12771279
 set j " \\\n "
12781280
 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
12791281
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
12801282
 writeln "PIKCHR_OPTIONS = [join $MINGW_PIKCHR_OPTIONS $j]\n"
12811283
1282
-writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1284
+writeln "\$(SQLITE3_OBJ):\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
12831285
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
12841286
 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
12851287
12861288
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR_extsrc)/cson_amalgamation.c"
12871289
 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/cson_amalgamation.c -o \$@\n"
12881290
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -435,13 +435,14 @@
435 # using -lsqlite3.
436 #
437 # Closely related is SQLITE3_ORIGIN, with the same numeric mapping plus
438 # a value of 2 means that we are building a client-provided sqlite3.c.
439 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
440 SQLITE3_OBJ.1 =
441 # SQLITE3_OBJ.2 is set by the configure process
442 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
 
443
444 # The USE_LINENOISE variable may be undefined, set to 0, or set
445 # to 1. If it is set to 0, then there is no need to build or link
446 # the linenoise.o object.
447 LINENOISE_DEF.0 =
@@ -535,11 +536,11 @@
535 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
536 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
537 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers\n"
538 }
539
540 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
541 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
542 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
543
544 writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h"
545 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
@@ -1125,13 +1126,14 @@
1125 #
1126 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
1127 # plus a value of 2 means that we are building a client-provided
1128 # sqlite3.c.
1129 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1130 SQLITE3_OBJ.1 =
1131 # SQLITE3_OBJ.2 is set by the configure process
1132 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
 
1133
1134 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1135 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1136 # source tree) is used and extra flags are provided to enable the
1137 # SQLite Encryption Extension.
@@ -1142,11 +1144,11 @@
1142 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1143 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1144 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1145 # SQLITE3_SHELL_SRC.2 comes from the configure process
1146 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1147 SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1148 SEE_FLAGS.0 =
1149 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1150 SEE_FLAGS. =
1151 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1152 }
@@ -1277,11 +1279,11 @@
1277 set j " \\\n "
1278 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
1279 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
1280 writeln "PIKCHR_OPTIONS = [join $MINGW_PIKCHR_OPTIONS $j]\n"
1281
1282 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1283 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1284 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1285
1286 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR_extsrc)/cson_amalgamation.c"
1287 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/cson_amalgamation.c -o \$@\n"
1288
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -435,13 +435,14 @@
435 # using -lsqlite3.
436 #
437 # Closely related is SQLITE3_ORIGIN, with the same numeric mapping plus
438 # a value of 2 means that we are building a client-provided sqlite3.c.
439 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
440 SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
441 # SQLITE3_OBJ.2 is set by the configure process
442 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
443 SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
444
445 # The USE_LINENOISE variable may be undefined, set to 0, or set
446 # to 1. If it is set to 0, then there is no need to build or link
447 # the linenoise.o object.
448 LINENOISE_DEF.0 =
@@ -535,11 +536,11 @@
536 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
537 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
538 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers\n"
539 }
540
541 writeln "\$(SQLITE3_OBJ):\t\$(SQLITE3_SRC)"
542 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
543 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
544
545 writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h"
546 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
@@ -1125,13 +1126,14 @@
1126 #
1127 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
1128 # plus a value of 2 means that we are building a client-provided
1129 # sqlite3.c.
1130 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1131 SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
1132 # SQLITE3_OBJ.2 is set by the configure process
1133 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1134 SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
1135
1136 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1137 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1138 # source tree) is used and extra flags are provided to enable the
1139 # SQLite Encryption Extension.
@@ -1142,11 +1144,11 @@
1144 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1145 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1146 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1147 # SQLITE3_SHELL_SRC.2 comes from the configure process
1148 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1149 SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1150 SEE_FLAGS.0 =
1151 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1152 SEE_FLAGS. =
1153 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1154 }
@@ -1277,11 +1279,11 @@
1279 set j " \\\n "
1280 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
1281 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
1282 writeln "PIKCHR_OPTIONS = [join $MINGW_PIKCHR_OPTIONS $j]\n"
1283
1284 writeln "\$(SQLITE3_OBJ):\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1285 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1286 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1287
1288 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR_extsrc)/cson_amalgamation.c"
1289 writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/cson_amalgamation.c -o \$@\n"
1290
M win/Makefile.mingw
+4 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1069,13 +1069,14 @@
10691069
 #
10701070
 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
10711071
 # plus a value of 2 means that we are building a client-provided
10721072
 # sqlite3.c.
10731073
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1074
-SQLITE3_OBJ.1 =
1074
+SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
10751075
 # SQLITE3_OBJ.2 is set by the configure process
10761076
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1077
+SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
10771078
10781079
 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
10791080
 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
10801081
 # source tree) is used and extra flags are provided to enable the
10811082
 # SQLite Encryption Extension.
@@ -1086,11 +1087,11 @@
10861087
 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
10871088
 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
10881089
 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
10891090
 # SQLITE3_SHELL_SRC.2 comes from the configure process
10901091
 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1091
-SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1092
+SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
10921093
 SEE_FLAGS.0 =
10931094
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
10941095
 SEE_FLAGS. =
10951096
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
10961097
@@ -2567,11 +2568,11 @@
25672568
 -Dgetenv=fossil_getenv \
25682569
 -Dfopen=fossil_fopen
25692570
25702571
 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
25712572
2572
-$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2573
+$(SQLITE3_OBJ): $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
25732574
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
25742575
 -c $(SQLITE3_SRC) -o $@
25752576
25762577
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
25772578
 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
25782579
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1069,13 +1069,14 @@
1069 #
1070 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
1071 # plus a value of 2 means that we are building a client-provided
1072 # sqlite3.c.
1073 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1074 SQLITE3_OBJ.1 =
1075 # SQLITE3_OBJ.2 is set by the configure process
1076 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
 
1077
1078 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1079 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1080 # source tree) is used and extra flags are provided to enable the
1081 # SQLite Encryption Extension.
@@ -1086,11 +1087,11 @@
1086 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1087 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1088 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1089 # SQLITE3_SHELL_SRC.2 comes from the configure process
1090 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1091 SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1092 SEE_FLAGS.0 =
1093 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1094 SEE_FLAGS. =
1095 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1096
@@ -2567,11 +2568,11 @@
2567 -Dgetenv=fossil_getenv \
2568 -Dfopen=fossil_fopen
2569
2570 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
2571
2572 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2573 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2574 -c $(SQLITE3_SRC) -o $@
2575
2576 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2577 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2578
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1069,13 +1069,14 @@
1069 #
1070 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
1071 # plus a value of 2 means that we are building a client-provided
1072 # sqlite3.c.
1073 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1074 SQLITE3_OBJ.1 = $(OBJDIR)/sqlite3-see.o
1075 # SQLITE3_OBJ.2 is set by the configure process
1076 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1077 SQLITE3_OBJ = $(SQLITE3_OBJ.$(SQLITE3_ORIGIN))
1078
1079 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1080 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1081 # source tree) is used and extra flags are provided to enable the
1082 # SQLite Encryption Extension.
@@ -1086,11 +1087,11 @@
1087 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1088 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1089 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1090 # SQLITE3_SHELL_SRC.2 comes from the configure process
1091 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1092 SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1093 SEE_FLAGS.0 =
1094 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1095 SEE_FLAGS. =
1096 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1097
@@ -2567,11 +2568,11 @@
2568 -Dgetenv=fossil_getenv \
2569 -Dfopen=fossil_fopen
2570
2571 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
2572
2573 $(SQLITE3_OBJ): $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2574 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2575 -c $(SQLITE3_SRC) -o $@
2576
2577 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2578 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2579

Keyboard Shortcuts

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