Fix a typo-bug that prevented --disable-amalgamation from working in

Makefile.in.  Also fix an overly long line in Makfile.in.

FossilOrigin-Name: 2c3c4ba035e548e97101142692133cf685da16bc

diff --git a/Makefile.in b/Makefile.in
index 8e57e40ce4b76acb85cd9a5bf8c2bf807a9ffe50..3659e944bde0fd1af4d841a5fedb01301e700497 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,7 +167,8 @@ USE_AMALGAMATION = @USE_AMALGAMATION@
 #
 LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
-         callback.lo complete.lo ctime.lo date.lo delete.lo expr.lo fault.lo fkey.lo \
+         callback.lo complete.lo ctime.lo date.lo delete.lo \
+         expr.lo fault.lo fkey.lo \
          fts3.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \
          fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \
          func.lo global.lo hash.lo \
@@ -181,7 +182,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          table.lo tokenize.lo trigger.lo \
          update.lo util.lo vacuum.lo \
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
-         wal.lo walker.lo where.lo utf.o vtab.lo
+         wal.lo walker.lo where.lo utf.lo vtab.lo
 
 # Object files for the amalgamation.
 #

diff --git a/manifest b/manifest
index a608e3fcb8c8e7c43ed512a22cff19a1184cdffb..9c53322e8d4991aa1f5400a86957de54510a990f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\snew\sWHERETRACE\smacros\sfor\sbetter\sdiagnostics\sof\sthe\squery\splanner.\nAdded\sa\snew\stest\scase\sfor\sthe\sperformance\sregression\sfixed\sby\sthe\sprevious\ncheck-in.
-D 2010-10-21T03:13:59
+C Fix\sa\stypo-bug\sthat\sprevented\s--disable-amalgamation\sfrom\sworking\sin\nMakefile.in.\s\sAlso\sfix\san\soverly\slong\sline\sin\sMakfile.in.
+D 2010-10-21T12:34:30
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in b01fdfcfecf8a0716c29867a67959f6148b79961
+F Makefile.in 2c8cefd962eca0147132c7cf9eaa4bb24c656f3f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@ -876,14 +876,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 28ba6255282b1419b8b165e8461018d257b1f6c2
-R 356faab25a033ed6868509f3a1892bd9
+P 1e0db99797be2821716de7138931ebd5cf8fa63b
+R 27c980fabcc9224b8f93e2c194859c02
 U drh
-Z 6b64c97bbd923b9a49e2113bdc5fc21f
+Z 5cd8cc8e5437bb048203dc5411dcdfb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMv6/7oxKgR168RlERArQqAJsHLWslgz2gwl1++DmjsYaRL73uAgCghxuU
-YoUJK40zLY6RYViwah2V2A4=
-=KADs
+iD4DBQFMwDNdoxKgR168RlERAhyoAJ9KXMEZDSgWeuiZ9fcEOsaX+xwW5ACYv6SC
+dUoJE9sYCjU60A5b4LhubA==
+=UcdN
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index baf776c133348df34ab89f3ce6c4fd88a2455e4f..748615b34bb23d2a866e8fbb8dca4e58c3cafc36 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e0db99797be2821716de7138931ebd5cf8fa63b
\ No newline at end of file
+2c3c4ba035e548e97101142692133cf685da16bc
\ No newline at end of file