Skip to content

Commit 648c4e5

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into release-integration
2 parents e6396f9 + 12069ec commit 648c4e5

137 files changed

Lines changed: 11110 additions & 3191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ TESTSRC = \
391391
$(TOP)/src/test_thread.c \
392392
$(TOP)/src/test_vfs.c \
393393
$(TOP)/src/test_wholenumber.c \
394-
$(TOP)/src/test_wsd.c
394+
$(TOP)/src/test_wsd.c \
395+
$(TOP)/ext/fts3/fts3_term.c \
396+
$(TOP)/ext/fts3/fts3_test.c
395397

396398
# Source code to the library files needed by the test fixture
397399
#
@@ -433,6 +435,7 @@ TESTSRC2 = \
433435
$(TOP)/ext/fts3/fts3.c \
434436
$(TOP)/ext/fts3/fts3_aux.c \
435437
$(TOP)/ext/fts3/fts3_expr.c \
438+
$(TOP)/ext/fts3/fts3_term.c \
436439
$(TOP)/ext/fts3/fts3_tokenizer.c \
437440
$(TOP)/ext/fts3/fts3_write.c \
438441
$(TOP)/ext/async/sqlite3async.c
@@ -848,12 +851,12 @@ fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR)
848851
fts3_icu.lo: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR)
849852
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_icu.c
850853

851-
fts3_snippet.lo: $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR)
852-
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c
853-
854854
fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
855855
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c
856856

857+
fts3_snippet.lo: $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR)
858+
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c
859+
857860
fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
858861
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c
859862

0 commit comments

Comments
 (0)