Fossil SCM

Sync up custom makefile for MinGW.

mistachkin 2022-09-09 17:22 trunk
Commit a3ed29ea34830e3f9dec17675c5dc92f5fb712b8657dc6487cbf3a98b0bf8538
Parent 457c14a490c76ef…
3 files changed +1 -1 +1 -1 +4 -3
~ tools/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M tools/makemake.tcl
+1 -1
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -1144,11 +1144,11 @@
11441144
 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
11451145
 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
11461146
 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
11471147
 # SQLITE3_SHELL_SRC.2 comes from the configure process
11481148
 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1149
-SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1149
+SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
11501150
 SEE_FLAGS.0 =
11511151
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
11521152
 SEE_FLAGS. =
11531153
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
11541154
 }
11551155
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -1144,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 }
1155
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -1144,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 }
1155
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1087,11 +1087,11 @@
10871087
 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
10881088
 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
10891089
 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
10901090
 # SQLITE3_SHELL_SRC.2 comes from the configure process
10911091
 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1092
-SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1092
+SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
10931093
 SEE_FLAGS.0 =
10941094
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
10951095
 SEE_FLAGS. =
10961096
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
10971097
10981098
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1087,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
1098
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1087,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
1098
M win/Makefile.mingw.mistachkin
+4 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -54,11 +54,11 @@
5454
5555
 #### Enable compiling with debug symbols (much larger binary)
5656
 #
5757
 # FOSSIL_ENABLE_SYMBOLS = 1
5858
59
-#### Enable JSON (http://www.json.org) support using "cson"
59
+#### Enable JSON (https://www.json.org) support using "cson"
6060
 #
6161
 FOSSIL_ENABLE_JSON = 1
6262
6363
 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
6464
 #
@@ -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.
@@ -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.mistachkin
2573
+$(SQLITE3_OBJ): $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw.mistachkin
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.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -54,11 +54,11 @@
54
55 #### Enable compiling with debug symbols (much larger binary)
56 #
57 # FOSSIL_ENABLE_SYMBOLS = 1
58
59 #### Enable JSON (http://www.json.org) support using "cson"
60 #
61 FOSSIL_ENABLE_JSON = 1
62
63 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
64 #
@@ -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.
@@ -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.mistachkin
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.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -54,11 +54,11 @@
54
55 #### Enable compiling with debug symbols (much larger binary)
56 #
57 # FOSSIL_ENABLE_SYMBOLS = 1
58
59 #### Enable JSON (https://www.json.org) support using "cson"
60 #
61 FOSSIL_ENABLE_JSON = 1
62
63 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
64 #
@@ -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.
@@ -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.mistachkin
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