Further refine FTS5 cleanup in Makefiles.

FossilOrigin-Name: b53a95063cf6b8ee8cad77e9fff4c50a356c43bb

diff --git a/Makefile.in b/Makefile.in
index 0cbd80cc4b65dd1e0973bb95099a22f49273b024..2c91b8252db9a480f841d39eaf59289a3fd4971c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1189,7 +1189,7 @@ clean:
        rm -f fuzzershell fuzzershell.exe
        rm -f fuzzcheck fuzzcheck.exe
        rm -f sqldiff sqldiff.exe
-       rm -f fts5.c fts5.h fts5parse.*
+       rm -f fts5.* fts5parse.*
 
 distclean:     clean
        rm -f config.log config.status libtool Makefile sqlite3.pc

diff --git a/Makefile.msc b/Makefile.msc
index 02a3330a2404436e75d1094510de43f5da6ce12b..ed6e58e949325bfa4c4468b75c4bbd578745cc57 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1833,7 +1833,7 @@ clean:
        del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
        del /Q sqlite-*-output.vsix 2>NUL
        del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe 2>NUL
-       del /Q fts5.c fts5.h fts5parse.* 2>NUL
+       del /Q fts5.* fts5parse.* 2>NUL
 
 # Dynamic link library section.
 #

diff --git a/main.mk b/main.mk
index 4b84873316de799ffe63bdff8a8af3fd426c77d3..0219689201495a102f9df384adcbee28b8fbcc49 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -869,4 +869,4 @@ clean:
        rm -f fuzzershell fuzzershell.exe
        rm -f fuzzcheck fuzzcheck.exe
        rm -f sqldiff sqldiff.exe
-       rm -f fts5.c fts5.h fts5parse.*
+       rm -f fts5.* fts5parse.*

diff --git a/manifest b/manifest
index 9d737448046712d704b1e91086073b85edd83250..57be5c77098f03ee842b8a3cf1904853e5239fd3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Skip\strying\sto\sinclude\s'intrin.h'\swhen\scompiling\sfor\sWinCE\swith\sMSVC.
-D 2015-07-14T21:56:17.995
+C Further\srefine\sFTS5\scleanup\sin\sMakefiles.
+D 2015-07-14T21:56:53.776
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 2a4a94d9c6ad8cde388b672d89d1463e6f38a6da
+F Makefile.in 6e8af213d49e6325bf283ebed7662254f8e15bda
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 86926e2330ad4b7ae6d4674762b53b293873b3fb
+F Makefile.msc efafcbf2be203b61dc7b6301703544753c513cb2
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@ -248,7 +248,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 551665e0bf7bd275a3e49dc8569ccb17098f7179
+F main.mk 7f0c666075028f306001ec9e883cf20dcb2deb64
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -1365,7 +1365,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3de030c904d125ccf41fa1929646b8a002b5341b
-R 005ae2df59e13158535147c0afd5a97b
+P 6db90ca2b4ac806b42532072ebe6b2a4a7b9713d
+R 8e7a1fc75fdd853e0505391914a90ba5
 U mistachkin
-Z b7895c5a0dbe848b1ad5c81c9335730e
+Z 9c90a50d81f502459cfc9d381f2f84f0

diff --git a/manifest.uuid b/manifest.uuid
index 9fca29ab1fd8eeab41abed8fe28fca22112f8209..fae52a1e73577929c2dde4f320a6b9a7afd8832f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6db90ca2b4ac806b42532072ebe6b2a4a7b9713d
\ No newline at end of file
+b53a95063cf6b8ee8cad77e9fff4c50a356c43bb
\ No newline at end of file