More MSVC makefile cleanup.

FossilOrigin-Name: df22556fd75997111e52f96572da8379dfe948be

diff --git a/Makefile.msc b/Makefile.msc
index 3621d4f92bea5329db6f1fc07a842ee667f5b427..504b2893ba7ba060521727a0db010c545cf14f69 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1326,12 +1326,29 @@ TESTOPTS = --verbose=file --output=test-out.txt
 #
 all:   dll libsqlite3.lib shell libtclsqlite3.lib
 
+# Dynamic link library section.
+#
+dll: $(SQLITE3DLL)
+
+# Shell executable.
+#
+shell: $(SQLITE3EXE)
+
 libsqlite3.lib:        $(LIBOBJ)
        $(LTLIB) $(LTLIBOPTS) /OUT:$@ $(LIBOBJ) $(TLIBS)
 
 libtclsqlite3.lib:     tclsqlite.lo libsqlite3.lib
        $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCLSTUB) $(TLIBS)
 
+$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
+       $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
+
+sqlite3.def: libsqlite3.lib
+       echo EXPORTS > sqlite3.def
+       dumpbin /all libsqlite3.lib \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_.*)$$" \1 \
+               | sort >> sqlite3.def
+
 $(SQLITE3EXE): $(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
        $(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c $(SHELL_CORE_SRC) \
                /link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
@@ -1419,7 +1436,7 @@ opcodes.lo:       opcodes.c
 # Rule to build the Win32 resources object file.
 #
 !IF $(USE_RC)!=0
-$(LIBRESOBJS): $(TOP)\src\sqlite3.rc $(HDR)
+$(LIBRESOBJS): $(TOP)\src\sqlite3.rc $(SQLITE3H)
        echo #ifndef SQLITE_RESOURCE_VERSION > sqlite3rc.h
        for /F %%V in ('type "$(TOP)\VERSION"') do ( \
                echo #define SQLITE_RESOURCE_VERSION %%V \
@@ -1957,20 +1974,3 @@ clean:
        del /Q sqlite-*-output.vsix 2>NUL
        del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe 2>NUL
        del /Q fts5.* fts5parse.* 2>NUL
-
-# Shell executable.
-#
-shell: $(SQLITE3EXE)
-
-# Dynamic link library section.
-#
-dll: $(SQLITE3DLL)
-
-sqlite3.def: libsqlite3.lib
-       echo EXPORTS > sqlite3.def
-       dumpbin /all libsqlite3.lib \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_.*)$$" \1 \
-               | sort >> sqlite3.def
-
-$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
-       $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)

diff --git a/manifest b/manifest
index 566db8de82ece3fac7f679cd85e3d6bd43f0897a..2e197ef01748d042cdf03d11b28de3ae6dac1d05 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Reenable\sthe\sxCurrentTime\sand\sxGetLastError\smethods\son\sthe\sunix\sVFSes\sas\slong\nas\sSQLITE_OMIT_DEPRECATED\sis\snot\sdefined.
-D 2016-01-22T19:44:03.065
+C More\sMSVC\smakefile\scleanup.
+D 2016-01-22T22:16:50.346
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc d2b93511a969c0c8fcf52aeb5e426571e8c610d2
+F Makefile.msc bf507c4168b28d0ba47ac29d53fd6244289f10b8
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1419,7 +1419,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 7323175337b7ba85ac932ca892b28860f6a5b688
-R 4fcfc780a1da751b6f90e6d6f3ced841
-U drh
-Z 703592c4495d8a71fd67fbd54e7f3927
+P c11c85fdb6514cae54bb44945cc197dcaba72307
+R 7e2bc2233b486c9642759e292a9803ed
+U mistachkin
+Z f537116bba79cbb015eb60c46b78af4d

diff --git a/manifest.uuid b/manifest.uuid
index a853332581aded9a3bf60cca064ea63358e06fb8..289f7591c2b6df3570eb8aba6bb71c9d87c0e917 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c11c85fdb6514cae54bb44945cc197dcaba72307
\ No newline at end of file
+df22556fd75997111e52f96572da8379dfe948be
\ No newline at end of file