Makefile.in and sqlite.def changes for encode and non-toplevel build; ticket #667...

FossilOrigin-Name: 72205a371ce5be4eac0a77d5d2fa8ccb23bb988f

diff --git a/Makefile.in b/Makefile.in
index 281cbdb6ce993deccf59be068f7f4d4266413872..482caa62a1e321620f77daaf149471ecb0fb965f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,7 @@ endif
 # Object files for the SQLite library.
 #
 LIBOBJ = attach.lo auth.lo btree.lo build.lo copy.lo date.lo \
-         delete.lo expr.lo func.lo hash.lo insert.lo \
+         delete.lo encode.lo expr.lo func.lo hash.lo insert.lo \
          main.lo opcodes.lo os.lo pager.lo parse.lo pragma.lo \
          printf.lo random.lo select.lo table.lo tokenize.lo \
          update.lo util.lo vacuum.lo vdbe.lo vdbeaux.lo \
@@ -108,6 +108,7 @@ SRC = \
   $(TOP)/src/copy.c \
   $(TOP)/src/date.c \
   $(TOP)/src/delete.c \
+  $(TOP)/src/encode.c \
   $(TOP)/src/expr.c \
   $(TOP)/src/func.c \
   $(TOP)/src/hash.c \
@@ -175,7 +176,7 @@ VDBEHDR = \
 #
 all:   sqlite.h libsqlite.la sqlite@TARGET_EXEEXT@
 
-Makefile: Makefile.in
+Makefile: $(TOP)/Makefile.in
        ./config.status
 
 # Generate the file "last_change" which contains the date of change
@@ -305,6 +306,9 @@ date.lo:    $(TOP)/src/date.c $(HDR)
 delete.lo:     $(TOP)/src/delete.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/delete.c
 
+encode.lo:     $(TOP)/src/encode.c
+       $(LTCOMPILE) -c $(TOP)/src/encode.c
+
 expr.lo:       $(TOP)/src/expr.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/expr.c
 
@@ -487,8 +491,8 @@ dll: sqlite.dll
 
 REAL_LIBOBJ = $(LIBOBJ:%.lo=.libs/%.o)
 
-sqlite.dll: $(LIBOBJ) sqlite.def
-       dllwrap --dllname sqlite.dll --def sqlite.def $(REAL_LIBOBJ)
+sqlite.dll: $(LIBOBJ) $(TOP)/sqlite.def
+       dllwrap --dllname sqlite.dll --def $(TOP)/sqlite.def $(REAL_LIBOBJ)
        strip sqlite.dll
 
 #target for dll import libraries
@@ -496,7 +500,7 @@ implib: sqlite.lib
 
 #make Borland C++ import library for the dll
 sqlite.lib: sqlite.dll
-       -implib -a sqlite.lib sqlite.dll sqlite.def
+       -implib -a sqlite.lib sqlite.dll $(TOP)/sqlite.def
        -lib /machine:i386 /def:sqlite.def 
 
 distclean:     clean

diff --git a/manifest b/manifest
index e5144303135ac2f915e684a8c61c877ee9dcc5c4..3cf4d8b71b801875cd8a8eba14e632bcba8cd132 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Prototypes\sfor\ssqlite_encode_binary()\sand\ssqlite_decode_binary()\sadded\nto\ssqlite.h.\s(CVS\s1296)
-D 2004-03-14T22:12:35
-F Makefile.in 46788b65500865e3fd965f7617d41697da8a11a1
+C Makefile.in\sand\ssqlite.def\schanges\sfor\sencode\sand\snon-toplevel\sbuild;\sticket\s#667\s(CVS\s1297)
+D 2004-03-16T21:49:50
+F Makefile.in 5d50a7d2a6a641e90a0312fc30d4e9c96b3903da
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION 4328de2a5fb5000699b907ca405cb9d84ba4e097
@@ -19,7 +19,7 @@ F main.mk 1b27efb94be53a96c4333584a00a59fcc87ddc37
 F publish.sh 1cd5c982388560fa91eedf6a338e210f713b35c8
 F spec.template a38492f1c1dd349fc24cb0565e08afc53045304b
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
-F sqlite.def a4d2ada1c3667fd1bc18a37bf2ff9dcf138e0d51
+F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/attach.c b01db0d3211f673d8e670abf7eaad04591d40d14
 F src/auth.c 4fa3b05bd19445d1c474d6751c4a508d6ea0abe1
@@ -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 786fe545560ec6c42bb0e344345031f425bf177a
-R d729397c0158d66009dcf358bf1f1b23
-U drh
-Z f444412b61c00a5e3edfa94afd51e12b
+P 359f0e787ff2d4d10fd23059e2ce99670e93f66a
+R 844f798d0d4db4bb8c51bd95cdec6c47
+U dougcurrie
+Z e289d5957606d6a682af1d12195f27e6

diff --git a/manifest.uuid b/manifest.uuid
index 54f965560fd2c895f867c52f1870ffa56fc0f515..7698ebb4a6f36017b845bef2b3198755ebaacfc5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-359f0e787ff2d4d10fd23059e2ce99670e93f66a
\ No newline at end of file
+72205a371ce5be4eac0a77d5d2fa8ccb23bb988f
\ No newline at end of file

diff --git a/sqlite.def b/sqlite.def
index 18fc3d9e90130853887bfe4b5b4e9f4c59ed8277..af8fe7a8407e583596876887615a775f47ba2a02 100644 (file)
--- a/sqlite.def
+++ b/sqlite.def
@@ -41,3 +41,5 @@ sqlite_finalize
 sqlite_reset
 sqlite_bind
 sqlite_last_statement_changes
+sqlite_encode_binary
+sqlite_decode_binary