Fix the autoconf makefile with all the latest changes. (CVS 4305)

FossilOrigin-Name: bc6d73d015327a9cf6b687aaf4b3f0d07e0fd484

diff --git a/Makefile.in b/Makefile.in
index 706eef51656ac0b1ce7b4537b906c1f65c539883..e5040020d35a0e6aaab5723fb013f0dfe6dd63f6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,8 +122,9 @@ TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
 #
 LIBOBJ = alter.lo analyze.lo attach.lo auth.lo btree.lo build.lo \
          callback.lo complete.lo date.lo \
-         delete.lo expr.lo func.lo hash.lo insert.lo loadext.lo \
-         main.lo malloc.lo opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
+         delete.lo expr.lo func.lo hash.lo journal.lo insert.lo loadext.lo \
+         main.lo malloc.lo mem1.lo mem2.lo mutex.lo \
+         opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
          pager.lo parse.lo pragma.lo prepare.lo printf.lo random.lo \
          select.lo table.lo tokenize.lo trigger.lo update.lo \
          util.lo vacuum.lo \
@@ -149,10 +150,14 @@ SRC = \
   $(TOP)/src/hash.c \
   $(TOP)/src/hash.h \
   $(TOP)/src/insert.c \
+  $(TOP)/src/journal.c \
   $(TOP)/src/legacy.c \
   $(TOP)/src/loadext.c \
   $(TOP)/src/main.c \
   $(TOP)/src/malloc.c \
+  $(TOP)/src/mem1.c \
+  $(TOP)/src/mem2.c \
+  $(TOP)/src/mutex.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
@@ -228,6 +233,7 @@ TESTSRC = \
   $(TOP)/src/test_btree.c \
   $(TOP)/src/test_config.c \
   $(TOP)/src/test_hexio.c \
+  $(TOP)/src/test_malloc.c \
   $(TOP)/src/test_md5.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
@@ -364,6 +370,9 @@ hash.lo:    $(TOP)/src/hash.c $(HDR)
 insert.lo:     $(TOP)/src/insert.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/insert.c
 
+journal.lo:    $(TOP)/src/journal.c $(HDR)
+       $(LTCOMPILE) -c $(TOP)/src/journal.c
+
 legacy.lo:     $(TOP)/src/legacy.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/legacy.c
 
@@ -376,6 +385,15 @@ main.lo:   $(TOP)/src/main.c $(HDR)
 malloc.lo:     $(TOP)/src/malloc.c $(HDR)
        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/malloc.c
 
+mem1.lo:       $(TOP)/src/mem1.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mem1.c
+
+mem2.lo:       $(TOP)/src/mem2.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mem2.c
+
+mutex.lo:      $(TOP)/src/mutex.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex.c
+
 pager.lo:      $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
        $(LTCOMPILE) -c $(TOP)/src/pager.c
 

diff --git a/manifest b/manifest
index 87d89fdb0580b733430d939041af2bea57f3c062..f6b8505994c96478ecf0aae544a254fc6d81a815 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Work\saround\sproblem\swith\sforward\sdeclarations\sof\sconstants\sin\sMSVC\nin\sthe\samalgamation.\s\sTicket\s#2574.\s(CVS\s4304)
-D 2007-08-27T23:26:59
-F Makefile.in 938f2769921fa1b30c633548f153804021eb1512
+C Fix\sthe\sautoconf\smakefile\swith\sall\sthe\slatest\schanges.\s(CVS\s4305)
+D 2007-08-27T23:38:43
+F Makefile.in 51bdcd1708f0971bc6b5d8eb47f00d127a899345
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 6200589421a0dfe968cd39c431fc62277b963540
@@ -562,7 +562,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 0ae30e5c76d9094307ea086a9993a953631ab9da
-R f7c4909241a345fabb8d74366d2587ad
+P dc80b2e1f4e1d31479aad9f39e651e62f2601fb8
+R 9bfd590424b3b4326f717196e76ff94e
 U drh
-Z 5904abd1ceb388c728380dc6a17f2d6d
+Z 22e7c8ec93c637537b92777c4664baab

diff --git a/manifest.uuid b/manifest.uuid
index fbb49658cb9281091c3578d29a1365da365c1b65..fe8d6be9fbe0bcf973d3f812e7bc1419f66aa12f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dc80b2e1f4e1d31479aad9f39e651e62f2601fb8
\ No newline at end of file
+bc6d73d015327a9cf6b687aaf4b3f0d07e0fd484
\ No newline at end of file