From c42cdce5e03b191b8909bee0f95c162c9d2853e7 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Wed, 21 Sep 2011 17:04:21 +0000
Subject: [PATCH] Fix the sqlite3_analyzer target in the configure-generated
 Makefile.

FossilOrigin-Name: 256cdbdc810cae23388ccf73583c591304294dbb
---
 Makefile.in   | 20 +++++++++-----------
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8f1f65dcd0..c2424b0287 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -885,18 +885,16 @@ soaktest:	testfixture$(TEXE) sqlite3$(TEXE)
 test:	testfixture$(TEXE) sqlite3$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/veryquick.test
 
-sqlite3_analyzer$(TEXE):	$(TESTFIXTURE_SRC) $(TOP)/tool/spaceanal.tcl
-	sed \
-	  -e '/^#/d' \
-	  -e 's,\\,\\\\,g' \
-	  -e 's,",\\",g' \
-	  -e 's,^,",' \
-	  -e 's,$$,\\n",' \
-	  $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
-	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
-		-DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \
-		$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
+sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+	echo "#define TCLSH 2" > $@
+	cat sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c >> $@
+	echo "static const char *tclsh_main_loop(void){" >> $@
+	echo "static const char *zMainloop = " >> $@
+	$(NAWK) -f $(TOP)/tool/tostr.awk $(TOP)/tool/spaceanal.tcl >> $@
+	echo "; return zMainloop; }" >> $@
 
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c spaceanal_tcl.h
+	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
 
 # Standard install and cleanup targets
 #
diff --git a/manifest b/manifest
index 7c20228ef4..70c66ccad8 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Change\sthe\sway\sthe\ssqlite3_analyzer\sexecutable\sis\sbuilt.
-D 2011-09-21T16:43:07.588
+C Fix\sthe\ssqlite3_analyzer\starget\sin\sthe\sconfigure-generated\sMakefile.
+D 2011-09-21T17:04:21.754
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
+F Makefile.in c9d4753bb534cad66d3b46e6923707b865f18ef6
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc b5e917439d5ed42364173d1648aae1d418e323ea
 F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@ -963,7 +963,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 36be31ff0af7f811fe2c6f7e26f058cffb7257e1
-R 8a6deb50b0588867fc20acf473ca1a9e
-U dan
-Z 506e969eac3211328e94965db47501bb
+P 05e3cced8a884e8bca6f208d2f09e335d3929eac
+R d2ae1eb53fb99dd2853da3eccd53ad17
+U drh
+Z 32d053563fdefa8a387e9c96c97f544b
diff --git a/manifest.uuid b/manifest.uuid
index 53acc37cad..2da362a9f8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05e3cced8a884e8bca6f208d2f09e335d3929eac
\ No newline at end of file
+256cdbdc810cae23388ccf73583c591304294dbb
\ No newline at end of file