From: drh Date: Fri, 5 Jan 2018 16:23:43 +0000 (+0000) Subject: Fix missing dependencies for shell.c in all makefiles. X-Git-Tag: version-3.22.0~108^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c93203363096c5946ae20f8339cc1539a8d83a5b;p=thirdparty%2Fsqlite.git Fix missing dependencies for shell.c in all makefiles. FossilOrigin-Name: 45495d3e256fef4d0669754726878ed17248fc781397ebb0421149ee9492f977 --- diff --git a/Makefile.in b/Makefile.in index e3dfb01baa..f6933f6c7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -994,7 +994,12 @@ SHELL_SRC = \ $(TOP)/src/shell.c.in \ $(TOP)/ext/misc/shathree.c \ $(TOP)/ext/misc/fileio.c \ - $(TOP)/ext/misc/completion.c + $(TOP)/ext/misc/completion.c \ + $(TOP)/ext/misc/sqlar.c \ + $(TOP)/ext/expert/sqlite3expert.c \ + $(TOP)/ext/expert/sqlite3expert.h \ + $(TOP)/ext/misc/zipfile.c \ + $(TOP)/src/test_windirent.c shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl $(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c diff --git a/Makefile.msc b/Makefile.msc index e2a6bbe86d..c9b78b68f8 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -2078,7 +2078,9 @@ SHELL_SRC = \ $(TOP)\ext\misc\completion.c \ $(TOP)\ext\misc\sqlar.c \ $(TOP)\ext\expert\sqlite3expert.c \ - $(TOP)\ext\expert\sqlite3expert.h + $(TOP)\ext\expert\sqlite3expert.h \ + $(TOP)\ext\misc\zipfile.c \ + $(TOP)\src\test_windirent.c # If use of zlib is enabled, add the "zipfile.c" source file. # diff --git a/main.mk b/main.mk index a6a7dbf1c2..5b6775a841 100644 --- a/main.mk +++ b/main.mk @@ -699,7 +699,8 @@ SHELL_SRC = \ $(TOP)/ext/misc/sqlar.c \ $(TOP)/ext/expert/sqlite3expert.c \ $(TOP)/ext/expert/sqlite3expert.h \ - $(TOP)/ext/misc/zipfile.c + $(TOP)/ext/misc/zipfile.c \ + $(TOP)/src/test_windirent.c shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl tclsh $(TOP)/tool/mkshellc.tcl >shell.c diff --git a/manifest b/manifest index eb04d9429e..9f339b15a4 100644 --- a/manifest +++ b/manifest @@ -1,10 +1,10 @@ -C In\sthe\sMakefile\sfor\sMSVC,\sonly\sattempt\sto\slink\sagainst\sTcl\swhen\sit\sis\sneeded.\s\sAlso,\sonly\scompile\s'zipfile.c'\swhen\suse\sof\szlib\sis\senabled. -D 2018-01-05T16:05:51.162 +C Fix\smissing\sdependencies\sfor\sshell.c\sin\sall\smakefiles. +D 2018-01-05T16:23:43.149 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea -F Makefile.in 1b11037c5ed3399a79433cc82c59b5e36a7b3a3e4e195bb27640d0d2145e03e1 +F Makefile.in f5c6285ac43b2e567d6cf463dff3744da960a19f2cf141744b4472842a97681e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 -F Makefile.msc 72f437d37191eb122ae289f5583af5eb9cae288fbd7914111f029066c84fbc84 +F Makefile.msc 69711303f4062857b1f07ecfe74d7952ce56e7401ed0248eea0569fd63b7f664 F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681 F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@ -405,7 +405,7 @@ F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 -F main.mk 739f832da37d29e252dd9f609c3864f3ecfa42136132eab9b11acb5162b7d02d +F main.mk 0c0ed98340ad4b7ebdfe587144a13cb12dfe3f09c16a6af5b4d4a7f3a881f2f8 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 @@ -1694,7 +1694,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P c63fb1700c0f67d90857b1f3859c203880d0939f356a64d8ae7cafc814ea72bf -R b5c6776760b2ddd7e6d28c4945f67802 -U mistachkin -Z 02b062c480e829873866b47ba5cd168a +P a33ad33cf031edee273afa4735c8564870465be22962a9c277e4ac43a307ff2c +R c9a59c27332856c5c3df1bda98801aaa +U drh +Z 3de3b81c4ea3d2cc9df2aeeb1cbc4214 diff --git a/manifest.uuid b/manifest.uuid index 8f4fdf47f5..bb30f4d234 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a33ad33cf031edee273afa4735c8564870465be22962a9c277e4ac43a307ff2c \ No newline at end of file +45495d3e256fef4d0669754726878ed17248fc781397ebb0421149ee9492f977 \ No newline at end of file