Make Windows .dll build use the real .o files, not the libtool-faked .lo

ones. (CVS 1275)

FossilOrigin-Name: cce5bbf49b0a30c40d24a559bc6cb4585dd9aea5

diff --git a/Makefile.in b/Makefile.in
index 1d8fa8696ce6d8bb8853c3569b9b310c55f787a5..e57a276435aa68131d44f073964add0531311d04 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -477,11 +477,15 @@ clean:
        rm -rf doc
        rm -f sqlite.dll sqlite.lib
 
-#make windows dll
+#
+# Windows section; all those funky .dll stuff ;-)
+#
 dll: sqlite.dll
 
+REAL_LIBOBJ = $(LIBOBJ:%.lo=.libs/%.o)
+
 sqlite.dll: $(LIBOBJ) sqlite.def
-       dllwrap --dllname sqlite.dll --def sqlite.def $(LIBOBJ)
+       dllwrap --dllname sqlite.dll --def sqlite.def $(REAL_LIBOBJ)
        strip sqlite.dll
 
 #target for dll import libraries

diff --git a/manifest b/manifest
index 6e704ab17a0674580993c425031c35a7faa17b7d..a40d91f2a68c6ae5062333ceeb429a66cad478ea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Build\ssystem\supdate:\n\n*\sUpdate\sof\sgenerated/libtoolized\sfiles:\sconfig.guess,\sconfig.sub,\n\s\s\sconfigure,\sltmain.sh\n*\sRemoval\sof\slibtool,\swhich\sis\sgenerated\sby\sconfigure\n*\sChanges\sto\sMakefile.in,\sadding\sbetter\ssupport\sfor\snewer\slibtools\s(CVS\s1274)
-D 2004-02-26T19:47:43
-F Makefile.in 3ecfe7f0b31fc33f233a5c1ce210d318b55d0847
+C Make\sWindows\s.dll\sbuild\suse\sthe\sreal\s.o\sfiles,\snot\sthe\slibtool-faked\s.lo\nones.\s(CVS\s1275)
+D 2004-02-28T18:02:21
+F Makefile.in afc6c0377773421633e592347097ad036eef6aeb
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION 8323c161a43094e2340bc1e57b99dacf10176301
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P ca99920b0dbf773962b47766d690154fd1276513
-R 2803b7e6c3377cf3c692fbc891df527e
+P 22d63bbf78997f0b31bb39054fbcfccf9d974bd6
+R 4e0891d3395dee30e172c7803be3f1e5
 U a.rottmann
-Z 94bbd9c978f31718dbf302d5eb195df5
+Z 9d5cc8cfa72fd925cf127d8f275e59f9

diff --git a/manifest.uuid b/manifest.uuid
index 08de57e2650414a2e6261424ccef353d27ddb788..636e2956219cecb73b2322f0fed03589f49b0909 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22d63bbf78997f0b31bb39054fbcfccf9d974bd6
\ No newline at end of file
+cce5bbf49b0a30c40d24a559bc6cb4585dd9aea5
\ No newline at end of file