diff options
| author | drh <drh@noemail.net> | 2014-08-18 20:23:29 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-08-18 20:23:29 +0000 |
| commit | 9f674f2600e7009328fbeb8d5c1614875439bb8d (patch) | |
| tree | 159276fee01f45d9a8754926a717c510fc734a8d | |
| parent | f5ab08c77903a3c2dfa0a68c3c243ce1ab047686 (diff) | |
| download | sqlite-9f674f2600e7009328fbeb8d5c1614875439bb8d.tar.gz sqlite-9f674f2600e7009328fbeb8d5c1614875439bb8d.zip | |
Fix the autoconf and MSVC makefiles so that they construct the changeset
command-line utility upon request. Delete that utility program when
"make clean" is run.
FossilOrigin-Name: 4dc15fe066f079ff31c89a5e0242dd5b3c851d29
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | Makefile.msc | 6 | ||||
| -rw-r--r-- | main.mk | 1 | ||||
| -rw-r--r-- | manifest | 16 | ||||
| -rw-r--r-- | manifest.uuid | 2 |
5 files changed, 19 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 7814529c2..3292da774 100644 --- a/Makefile.in +++ b/Makefile.in @@ -964,6 +964,9 @@ showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) +changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo + $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) + rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) @@ -1012,7 +1015,7 @@ clean: rm -f testfixture$(TEXE) test.db rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE) rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE) - rm -f wordcount$(TEXE) + rm -f wordcount$(TEXE) changeset$(TEXE) rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def rm -f sqlite3.c rm -f sqlite3rc.h diff --git a/Makefile.msc b/Makefile.msc index 38ea41ffb..d246cf03c 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -1476,6 +1476,10 @@ showwal.exe: $(TOP)\tool\showwal.c $(SQLITE3C) $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \ $(TOP)\tool\showwal.c $(SQLITE3C) +changeset.exe: $(TOP)\ext\session\changeset.c $(SQLITE3C) + $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \ + $(TOP)\ext\session\changeset.c $(SQLITE3C) + fts3view.exe: $(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C) $(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \ $(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C) @@ -1512,7 +1516,7 @@ clean: del /Q tclsqlite3.exe tclsqlite3.exp del /Q testloadext.dll testloadext.exp del /Q testfixture.exe testfixture.exp test.db - del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe + del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe changeset.exe del /Q showjournal.exe showstat4.exe showwal.exe speedtest1.exe del /Q wordcount.exe del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def @@ -722,6 +722,7 @@ clean: rm -f showjournal showjournal.exe rm -f showstat4 showstat4.exe rm -f showwal showwal.exe + rm -f changeset changeset.exe rm -f speedtest1 speedtest1.exe rm -f wordcount wordcount.exe rm -f sqlite3.c sqlite3-*.c fts?amal.c tclsqlite3.c @@ -1,9 +1,9 @@ -C Fix\sa\sharmless\scompiler\swarning\sin\sthe\ssessionAppendDelete()\sfunction. -D 2014-08-18T20:14:30.667 +C Fix\sthe\sautoconf\sand\sMSVC\smakefiles\sso\sthat\sthey\sconstruct\sthe\schangeset\ncommand-line\sutility\supon\srequest.\s\sDelete\sthat\sutility\sprogram\swhen\n"make\sclean"\sis\srun. +D 2014-08-18T20:23:29.435 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377 +F Makefile.in d5ad373b7a23525414b8843b3084cf90c560d92f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962 +F Makefile.msc f1bbf555916b6e60887d86cea62f27e6a26cdb24 F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07 @@ -162,7 +162,7 @@ F ext/session/test_session.c a252fb669d3a1b3552ee7b87fe610debc0afeb7b F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 -F main.mk 95de2e32fbe62b10e28bd7a131e2b003b923a8b3 +F main.mk a9987b6655610e663e9f055e0f1646227f45cddd F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@ -1203,7 +1203,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 31addb627fdbaeb908e0611ad82f6db7537428ea -R 0c1b981f1387fdad5168bd8925d76ab9 +P 1324d08d0c639378cf1b03bd6410db81947747ac +R fdaf7ebc782210d979a62294e31e9051 U drh -Z 34dce636dabda531b1c7f9aae0a417c1 +Z e19e0e50f2717082ee6e33a1c9b88ce5 diff --git a/manifest.uuid b/manifest.uuid index c5348ad8b..2e186914d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1324d08d0c639378cf1b03bd6410db81947747ac
\ No newline at end of file +4dc15fe066f079ff31c89a5e0242dd5b3c851d29
\ No newline at end of file |