Fix Windows makefile breakage caused by [ae9d7c9c922bb241].

FossilOrigin-Name: c41324139d6a75b0d37aeec2b0572c63207dd0b06e6a99e4fb221be564e73024

diff --git a/Makefile.msc b/Makefile.msc
index e67638287fbb61b8e54a3e6a6968008a4bd78d60..2ce79ab6d1eddb0c15b9ae2b4a918c533c434e65 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2485,24 +2485,6 @@ FTS5_SRC = \
    $(TOP)\ext\fts5\fts5_varint.c \
    $(TOP)\ext\fts5\fts5_vocab.c
 
-LSM1_SRC = \
-   $(TOP)\ext\lsm1\lsm.h \
-   $(TOP)\ext\lsm1\lsmInt.h \
-   $(TOP)\ext\lsm1\lsm_ckpt.c \
-   $(TOP)\ext\lsm1\lsm_file.c \
-   $(TOP)\ext\lsm1\lsm_log.c \
-   $(TOP)\ext\lsm1\lsm_main.c \
-   $(TOP)\ext\lsm1\lsm_mem.c \
-   $(TOP)\ext\lsm1\lsm_mutex.c \
-   $(TOP)\ext\lsm1\lsm_shared.c \
-   $(TOP)\ext\lsm1\lsm_sorted.c \
-   $(TOP)\ext\lsm1\lsm_str.c \
-   $(TOP)\ext\lsm1\lsm_tree.c \
-   $(TOP)\ext\lsm1\lsm_unix.c \
-   $(TOP)\ext\lsm1\lsm_varint.c \
-   $(TOP)\ext\lsm1\lsm_vtab.c \
-   $(TOP)\ext\lsm1\lsm_win32.c
-
 fts5parse.c:   $(TOP)\ext\fts5\fts5parse.y lemon.exe
        copy /Y $(TOP)\ext\fts5\fts5parse.y .
        copy /B fts5parse.y +,,
@@ -2516,11 +2498,6 @@ fts5.c:  $(FTS5_SRC) $(JIM_TCLSH)
        copy /Y $(TOP)\ext\fts5\fts5.h .
        copy /B fts5.h +,,
 
-lsm1.c:        $(LSM1_SRC) $(JIM_TCLSH)
-       $(JIM_TCLSH) $(TOP)\ext\lsm1\tool\mklsm1c.tcl
-       copy /Y $(TOP)\ext\lsm1\lsm.h .
-       copy /B lsm.h +,,
-
 fts5.lo:       fts5.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c
 
@@ -2827,9 +2804,6 @@ tcl-env:
        @echo JIM_TCLSH = $(JIM_TCLSH)
        @echo VISUALSTUDIOVERSION = $(VISUALSTUDIOVERSION)
 
-LSMDIR=$(TOP)\ext\lsm1
-!INCLUDE $(LSMDIR)\Makefile.msc
-
 moreclean:     clean
        del /Q $(SQLITE3C) $(SQLITE3H) 2>NUL
 # <</mark>>
@@ -2871,7 +2845,6 @@ clean:
        del /Q kvtest.exe ossshell.exe scrub.exe 2>NUL
        del /Q showshm.exe sqlite3_checker.* sqlite3_expert.exe 2>NUL
        del /Q fts5.* fts5parse.* 2>NUL
-       del /Q lsm.h lsm1.c 2>NUL
        del /q src-verify.exe 2>NUL
        del /q jimsh.exe jimsh0.exe 2>NUL
 # <</mark>>

diff --git a/manifest b/manifest
index 778056be1b36510019dece55722679356796b674..9b2b42e5bc12c87b6b9ee7a92424053b61ff0b08 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Add\s*.obj\sto\sthe\smake\sclean\starget\sfor\sthe\ssake\sof\sthe\sUnix-on-Windows\senvironments.
-D 2025-08-06T16:51:12.817
+C Fix\sWindows\smakefile\sbreakage\scaused\sby\s[ae9d7c9c922bb241].
+D 2025-08-06T19:05:39.163
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
 F Makefile.in a6c14b6906f5322920dd5d1ff9a84808337911068f2a6e777ec7088a87cbc3a8
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
-F Makefile.msc e17608035fb75d3e5b322f846c6c3cbe80a5f34abf5df9e400c40dd55436dc14
+F Makefile.msc b87ac9041d87f61fabd6074e6d8b71dd7f78c884a2307bbb9301f9d436ce9242
 F README.md e28077cfbef795e99c9c75ed95aa7257a1166709b562076441a8506ac421b7c1
 F VERSION 16eddb43056a79c1977427ab7a05f3457c373fa159dcdced8754eb89ce7e06b8
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 79a14a5ebd0e8a0aa7f7bb180fcaa348a3ecd046662e3ee05a34f2c9a7db3dd6
-R f2300cb4a5c3a2f67beb54bf4058ec3c
-U stephan
-Z 2b29c52956948fb2b524de581d85b394
+P da07e0c02fe7de7b67f2564c29f49f251ae2374c0e269d246bd13e68a9a73328
+R b5216907e49e2b01f564bdbfd4b1e713
+U drh
+Z dea4777b257de656f41a34569efd6ff5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8e8413c4f94a15f9e68c5e11929698cc5beef667..131ad1bc98fb57008a5b8d739a0ccb37537680da 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-da07e0c02fe7de7b67f2564c29f49f251ae2374c0e269d246bd13e68a9a73328
+c41324139d6a75b0d37aeec2b0572c63207dd0b06e6a99e4fb221be564e73024