Change autoconf/Makefile.am to avoid building target sqlite3.o as part of both the...

FossilOrigin-Name: 85bfa9a67f9970843c55c3fbe0ec44ace6985896

diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
index 88bc23df452930a028c5eff60b26be7438b27caa..60d2ba2673aeaf193a8dc6823f53fd3cf9b7ac05 100644 (file)
--- a/autoconf/Makefile.am
+++ b/autoconf/Makefile.am
@@ -6,8 +6,9 @@ libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
 
 bin_PROGRAMS = sqlite3
-sqlite3_SOURCES = shell.c sqlite3.h
-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
+sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
+sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_CFLAGS = $(AM_CFLAGS)
 
 include_HEADERS = sqlite3.h sqlite3ext.h
 

diff --git a/manifest b/manifest
index 1139d40711a29f063b566269a17b64bbf97a2fd7..367e02a4b7db93df4c6504aff248a0ade1ca06fc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssqlite3_memory_used()\sand\ssqlite3_memory_highwater()\sinterfaces\sso\nthat\sthey\sreally\sdo\sprovide\sa\s64-bit\sanswer.
-D 2015-05-10T02:01:08.271
+C Change\sautoconf/Makefile.am\sto\savoid\sbuilding\starget\ssqlite3.o\sas\spart\sof\sboth\sthe\sshared\slibrary\sand\sshell\stool.\sDoing\sso\scauses\sproblems\sfor\sparallel\sbuilds.
+D 2015-05-11T06:22:22.935
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -13,7 +13,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
-F autoconf/Makefile.am 4012e106208c7b86ba54d06e9ed400b59a4dee6b
+F autoconf/Makefile.am 27de1af382c82e81f1fe36a7f38528fba004eb1a
 F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/config.guess 94cc57e2a3fdb9c235b362ace86d77e89d188cad x
@@ -1256,7 +1256,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 05b4b1f2a937c06c90db70c09890038f6c98ec40
-R 9b6fcbbc8ca8af1c1035670670115add
-U drh
-Z 0488f0f2f633ca7ffcc2d7caebddb063
+P 8a0d5d5e9a4515603c47e9354af47550155a6f2d
+R 3193d17811806f4a9cbdb09f2be5bd14
+U dan
+Z 11303427faf9306de18929db0c47633e

diff --git a/manifest.uuid b/manifest.uuid
index b9a773b53e2261db65e3c39f1e17f0a0845e32ef..04374a848ee063745e38ca0b1e3877637735cad6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a0d5d5e9a4515603c47e9354af47550155a6f2d
\ No newline at end of file
+85bfa9a67f9970843c55c3fbe0ec44ace6985896
\ No newline at end of file