MinGW/MSYS build fixes; ticket #765 (CVS 1623)

FossilOrigin-Name: 7121cee78c2ed20fd09190fdcca1c8c92ef1e09d

diff --git a/Makefile.in b/Makefile.in
index ba6839f281079b05ddcdc951d8aa4ccec84c3dad..df238fe70632a039ff5964661d4b6f8bcc53f1e8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,6 +148,7 @@ TESTSRC = \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/pager.c \
+  $(TOP)/src/pragma.c \
   $(TOP)/src/test1.c \
   $(TOP)/src/test2.c \
   $(TOP)/src/test3.c \
@@ -317,7 +318,7 @@ parse.lo:   parse.c $(HDR)
 
 parse.h:       parse.c
 
-parse.c:       $(TOP)/src/parse.y lemon
+parse.c:       $(TOP)/src/parse.y lemon@BUILD_EXEEXT@
        cp $(TOP)/src/parse.y .
        ./lemon parse.y
 
@@ -389,10 +390,10 @@ testfixture@TARGET_EXEEXT@:       $(TOP)/src/tclsqlite.c libtclsqlite3.la libsqlite3.l
                 -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
                libtclsqlite3.la libsqlite3.la $(LIBTCL)
 
-fulltest:      testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
+fulltest:      testfixture@TARGET_EXEEXT@ sqlite3@TARGET_EXEEXT@
        ./testfixture $(TOP)/test/all.test
 
-test:  testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
+test:  testfixture@TARGET_EXEEXT@ sqlite3@TARGET_EXEEXT@
        ./testfixture $(TOP)/test/quick.test
 
 
@@ -401,8 +402,8 @@ test:       testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
 arch.html:     $(TOP)/www/arch.tcl
        tclsh $(TOP)/www/arch.tcl >arch.html
 
-arch.png:      $(TOP)/www/arch.png
-       cp $(TOP)/www/arch.png .
+arch2.gif:     $(TOP)/www/arch2.gif
+       cp $(TOP)/www/arch2.gif .
 
 c_interface.html:      $(TOP)/www/c_interface.tcl
        tclsh $(TOP)/www/c_interface.tcl >c_interface.html
@@ -505,7 +506,7 @@ version3.html:      $(TOP)/www/version3.tcl
 #
 DOC = \
   arch.html \
-  arch.png \
+  arch2.gif \
   c_interface.html \
   capi3.html \
   capi3ref.html \
@@ -538,7 +539,7 @@ DOC = \
   vdbe.html \
   version3.html
 
-doc:   $(DOC)
+doc:   common.tcl $(DOC)
        mkdir -p doc
        mv $(DOC) doc
 
@@ -561,27 +562,28 @@ clean:
        rm -f *.da *.bb *.bbg gmon.out
        rm -f testfixture@TARGET_EXEEXT@ test.db
        rm -rf doc
-       rm -f sqlite.dll sqlite.lib
+       rm -f common.tcl
+       rm -f sqlite3.dll sqlite3.lib
 
 #
 # Windows section; all this funky .dll stuff ;-)
 #
-dll: sqlite.dll
+dll: sqlite3.dll
 
 REAL_LIBOBJ = $(LIBOBJ:%.lo=.libs/%.o)
 
-sqlite.dll: $(LIBOBJ) $(TOP)/sqlite.def
-       dllwrap --dllname sqlite.dll --def $(TOP)/sqlite.def $(REAL_LIBOBJ)
-       strip sqlite.dll
+sqlite3.dll: $(LIBOBJ) $(TOP)/sqlite3.def
+       dllwrap --dllname sqlite3.dll --def $(TOP)/sqlite3.def $(REAL_LIBOBJ)
+       strip sqlite3.dll
 
 #target for dll import libraries
-implib: sqlite.lib 
+implib: sqlite3.lib 
 
 #make Borland C++ and/or Microsoft VC import library for the dll
 #   ignore any errors (usually due to missing programs)
-sqlite.lib: sqlite.dll
-       -implib -a sqlite.lib sqlite.dll
-       -lib /machine:i386 /def:$(TOP)/sqlite.def 
+sqlite3.lib: sqlite3.dll
+       -implib -a sqlite3.lib sqlite3.dll
+       -lib /machine:i386 /def:$(TOP)/sqlite3.def 
 
 distclean:     clean
        rm -f config.log config.status libtool Makefile config.h

diff --git a/manifest b/manifest
index 6604e957dd4fca0577f90d679d65f5935926ba7e..e5a69ef1a3ddc44956edc4a42bc7760a2d178d88 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Fix\sdeclaration\sproblem\sin\sthe\sprevious\scheck-in.\s(CVS\s1622)
-D 2004-06-18T17:45:12
-F Makefile.in 5125bd6b92fca76275a6fc6c6ff425484b8cec0a
+C MinGW/MSYS\sbuild\sfixes;\sticket\s#765\s(CVS\s1623)
+D 2004-06-18T23:19:20
+F Makefile.in 2659cbce885c1365cb0a5fbeeed5ad69a354fa70
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION 8c6981d7f982c3e2986fda2f34282264a4db344c
@@ -225,7 +225,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl af528563442e3039928f9018327a18157e53a44f
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 2590fffcaa92adc619f7a927d2b5169d8dfef50a
-R da897760fd987d26eb94c198c43f975a
-U drh
-Z 7472299a336decf9fcfc4b5af7956e15
+P f312057da4304857d16b344b784c84ce14e2ef69
+R b20ad43ea14e6dc2f45c4b6098329cad
+U dougcurrie
+Z b47ac03834a134c7ae6483a335c150db

diff --git a/manifest.uuid b/manifest.uuid
index ac0859781bb337bae43a155aa099ebad538c4f77..70bdcc450db73c9acb764881178b73bff54e8306 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f312057da4304857d16b344b784c84ce14e2ef69
\ No newline at end of file
+7121cee78c2ed20fd09190fdcca1c8c92ef1e09d
\ No newline at end of file