From: dan <dan@noemail.net>
Date: Tue, 19 May 2015 11:38:32 +0000 (+0000)
Subject: Update Makefile.in so that the amalgamation files built by "make sqlite3.c" include... 
X-Git-Tag: version-3.8.11~114^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08e7199feb7b7951985ecf99f5978c54b017aa10;p=thirdparty%2Fsqlite.git

Update Makefile.in so that the amalgamation files built by "make sqlite3.c" include fts5.

FossilOrigin-Name: 2870a80593302e7835c5f5d167f42710d8439e7d
---

diff --git a/Makefile.in b/Makefile.in
index a6984b2fd8..45cd692552 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -340,6 +340,22 @@ SRC += \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
 
+SRC += \
+   $(TOP)/ext/fts5/fts5.h \
+   $(TOP)/ext/fts5/fts5Int.h \
+   $(TOP)/ext/fts5/fts5_aux.c \
+   $(TOP)/ext/fts5/fts5_buffer.c \
+   $(TOP)/ext/fts5/fts5.c \
+   $(TOP)/ext/fts5/fts5_config.c \
+   $(TOP)/ext/fts5/fts5_expr.c \
+   $(TOP)/ext/fts5/fts5_hash.c \
+   $(TOP)/ext/fts5/fts5_index.c \
+   fts5parse.c fts5parse.h \
+   $(TOP)/ext/fts5/fts5_storage.c \
+   $(TOP)/ext/fts5/fts5_tokenize.c \
+   $(TOP)/ext/fts5/fts5_unicode2.c \
+   $(TOP)/ext/fts5/fts5_vocab.c 
+
 
 # Generated source code files
 #
@@ -942,6 +958,18 @@ fts3_write.lo:	$(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
 rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
 
+fts5parse.c:	$(TOP)/ext/fts5/fts5parse.y lemon 
+	cp $(TOP)/ext/fts5/fts5parse.y .
+	rm -f fts5parse.h
+	./lemon $(OPTS) fts5parse.y
+	mv fts5parse.c fts5parse.c.orig
+	echo "#ifdef SQLITE_ENABLE_FTS5" > fts5parse.c
+	cat fts5parse.c.orig | sed 's/yy/fts5yy/g' | sed 's/YY/fts5YY/g' \
+		| sed 's/TOKEN/FTS5TOKEN/g' >> fts5parse.c
+	echo "#endif /* SQLITE_ENABLE_FTS5 */" >> fts5parse.c
+
+fts5parse.h: fts5parse.c
+
 
 # Rules to build the 'testfixture' application.
 #
diff --git a/manifest b/manifest
index 3125dc22c9..50a6c9ec79 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Fix\sa\smemory\sleak\sthat\scould\sfollow\san\sOOM\scondition\sin\sfts5.
-D 2015-05-19T11:32:01.082
+C Update\sMakefile.in\sso\sthat\sthe\samalgamation\sfiles\sbuilt\sby\s"make\ssqlite3.c"\sinclude\sfts5.
+D 2015-05-19T11:38:32.860
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
+F Makefile.in 2c28e557780395095c307a6e5cb539419027eb5e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -1328,7 +1328,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 4dfe2e5871704125338620705e6638f36baaacd7
-R ae51969adfb13f0909e21c548fe61d33
+P de9f8ef6ebf036df5a558cd78fb4927da2d83ce8
+R 48462bff9aab6209ce6b76328087ee6c
 U dan
-Z 9066bd5c4ea85d49ccee057135986e82
+Z 49662f04b4638e7ccdb8bbbc0c7d2948
diff --git a/manifest.uuid b/manifest.uuid
index 693354493e..12095dd529 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de9f8ef6ebf036df5a558cd78fb4927da2d83ce8
\ No newline at end of file
+2870a80593302e7835c5f5d167f42710d8439e7d
\ No newline at end of file