Fix main.mk so that the "amalgamation-testfixture" target works again.

FossilOrigin-Name: 22265323f7785ec5e2afc14a989d53dcbbd36250

diff --git a/main.mk b/main.mk
index 24e54ad83d318994f87676369ad21cb186471bab..33b2e6ec14601426d63da0e699226245693fe317 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -220,6 +220,7 @@ SRC += \
 # Source code to the test files.
 #
 TESTSRC = \
+  $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_test.c \
   $(TOP)/src/test1.c \
   $(TOP)/src/test2.c \
@@ -300,7 +301,6 @@ TESTSRC2 = \
   $(TOP)/ext/fts3/fts3.c \
   $(TOP)/ext/fts3/fts3_aux.c \
   $(TOP)/ext/fts3/fts3_expr.c \
-  $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_write.c \
   $(TOP)/ext/async/sqlite3async.c

diff --git a/manifest b/manifest
index a3e25b1a106e3fa6aaf0e29d1c72bee7ad98f8a5..829d0e7b9f938c629b22d05ef06300d9ab8f3e34 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\slocaltime\slogic\syet\sagain\sin\sorder\sto\smake\sall\sbranches\sreachable\nand\sto\sfollow\sGNU\sstandards\sfor\sHAVE_LOCALTIME_R-type\smacros.\nTicket\s[bd484a090c8077].
-D 2011-06-21T15:01:25.129
+C Fix\smain.mk\sso\sthat\sthe\s"amalgamation-testfixture"\starget\sworks\sagain.
+D 2011-06-21T15:24:30.118
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -104,7 +104,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk 4918ba9d27921895ddc6abaeebb43a633f5d23c7
+F main.mk d799fb600383cee11fed58876a7cccb749dd2614
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -948,7 +948,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 5b68dae320d0fa3dc433826811e5018a47461de7
-R ed41c3134b790559b6de3aa9dbc8d008
-U drh
-Z 9cf1abaccd2a2f678b16a61368320667
+P 176248095b8056443ebcbff819e575bd100f5e50
+R a2592e3234167f1d411e9fcd7ca02e75
+U dan
+Z 059270d02719ec3f38fe6aac1552df07

diff --git a/manifest.uuid b/manifest.uuid
index fd448c5742b184b7eabb1595b4234bceaf1c10e3..4330c575265495fb1a1370c55b826dd0cf726cdc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-176248095b8056443ebcbff819e575bd100f5e50
\ No newline at end of file
+22265323f7785ec5e2afc14a989d53dcbbd36250
\ No newline at end of file