Add/move files in Makefile.in to bring it more in line with main.mk (CVS 4856)

FossilOrigin-Name: b57fc81c3d5f6c7091bdd37f8164887f990a5128

diff --git a/Makefile.in b/Makefile.in
index 09ee1dd38bdea2ef2a686fa337da53dc79dce483..007572bc7f69da3240c4be3631f15aab3dbd6ba0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,6 +160,7 @@ SRC = \
   $(TOP)/src/btmutex.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/btree.h \
+  $(TOP)/src/btreeInt.h \
   $(TOP)/src/build.c \
   $(TOP)/src/callback.c \
   $(TOP)/src/complete.c \
@@ -183,10 +184,13 @@ SRC = \
   $(TOP)/src/mem4.c \
   $(TOP)/src/mem5.c \
   $(TOP)/src/mutex.c \
+  $(TOP)/src/mutex.h \
   $(TOP)/src/mutex_os2.c \
   $(TOP)/src/mutex_unix.c \
   $(TOP)/src/mutex_w32.c \
   $(TOP)/src/os.c \
+  $(TOP)/src/os.h \
+  $(TOP)/src/os_common.h \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/os_os2.c \
@@ -200,7 +204,9 @@ SRC = \
   $(TOP)/src/select.c \
   $(TOP)/src/shell.c \
   $(TOP)/src/sqlite.h.in \
+  $(TOP)/src/sqlite3ext.h \
   $(TOP)/src/sqliteInt.h \
+  $(TOP)/src/sqliteLimit.h \
   $(TOP)/src/table.c \
   $(TOP)/src/tclsqlite.c \
   $(TOP)/src/tokenize.c \
@@ -220,6 +226,16 @@ SRC = \
   $(TOP)/src/vtab.c \
   $(TOP)/src/where.c
 
+# Generated source code files
+#
+SRC += \
+  keywordhash.h \
+  opcodes.c \
+  opcodes.h \
+  parse.c \
+  parse.h \
+  sqlite3.h
+
 # Source code for extensions
 #
 SRC += \
@@ -253,7 +269,6 @@ SRC += \
 SRC += \
   $(TOP)/ext/icu/icu.c
 
-
 # Source code to the test files.
 #
 TESTSRC = \
@@ -323,6 +338,7 @@ HDR = \
    $(TOP)/src/sqlite3ext.h \
    $(TOP)/src/sqliteInt.h  \
    $(TOP)/src/vdbe.h \
+   $(TOP)/src/vdbeInt.h \
    parse.h \
    $(TOP)/src/config.h
 
@@ -341,12 +357,6 @@ HDR += \
   $(TOP)/ext/fts3/fts3_hash.h \
   $(TOP)/ext/fts3/fts3_tokenizer.h
 
-# Header files used by the VDBE submodule
-#
-VDBEHDR = \
-   $(HDR) \
-   $(TOP)/src/vdbeInt.h
-
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
@@ -383,12 +393,11 @@ sqlite3$(TEXE):   $(TOP)/src/shell.c libsqlite3.la sqlite3.h
 # files are automatically generated.  This target takes care of
 # all that automatic generation.
 #
-.target_source:        $(SRC) parse.c opcodes.c keywordhash.h $(VDBEHDR) 
+.target_source:        $(SRC)
        rm -rf tsrc
        mkdir -p tsrc
-       cp $(SRC) $(VDBEHDR) tsrc
+       cp $(SRC) tsrc
        rm tsrc/sqlite.h.in tsrc/parse.y
-       cp parse.c opcodes.c keywordhash.h tsrc
        touch .target_source
 
 sqlite3.c:     .target_source $(TOP)/tool/mksqlite3c.tcl
@@ -583,25 +592,25 @@ util.lo:  $(TOP)/src/util.c $(HDR)
 vacuum.lo:     $(TOP)/src/vacuum.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vacuum.c
 
-vdbe.lo:       $(TOP)/src/vdbe.c $(VDBEHDR)
+vdbe.lo:       $(TOP)/src/vdbe.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vdbe.c
 
-vdbeapi.lo:    $(TOP)/src/vdbeapi.c $(VDBEHDR)
+vdbeapi.lo:    $(TOP)/src/vdbeapi.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vdbeapi.c
 
-vdbeaux.lo:    $(TOP)/src/vdbeaux.c $(VDBEHDR)
+vdbeaux.lo:    $(TOP)/src/vdbeaux.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vdbeaux.c
 
-vdbeblob.lo:   $(TOP)/src/vdbeblob.c $(VDBEHDR)
+vdbeblob.lo:   $(TOP)/src/vdbeblob.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vdbeblob.c
 
-vdbefifo.lo:   $(TOP)/src/vdbefifo.c $(VDBEHDR)
+vdbefifo.lo:   $(TOP)/src/vdbefifo.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vdbefifo.c
 
-vdbemem.lo:    $(TOP)/src/vdbemem.c $(VDBEHDR)
+vdbemem.lo:    $(TOP)/src/vdbemem.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vdbemem.c
 
-vtab.lo:       $(TOP)/src/vtab.c $(VDBEHDR)
+vtab.lo:       $(TOP)/src/vtab.c $(HDR)
        $(LTCOMPILE) -c $(TOP)/src/vtab.c
 
 where.lo:      $(TOP)/src/where.c $(HDR)

diff --git a/manifest b/manifest
index ba171092734bc37b775460956bf28f2c4620ac5e..215e49f193faffccac6aaf6e55b7d0864db6246e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Eliminate\sa\srace\scondition\sfrom\slock4.test.\s(CVS\s4855)
-D 2008-03-13T04:53:53
+C Add/move\sfiles\sin\sMakefile.in\sto\sbring\sit\smore\sin\sline\swith\smain.mk\s(CVS\s4856)
+D 2008-03-13T18:28:04
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in 3e2eb2b4a4148aff92bbc6d8496d0696c36bf0b6
+F Makefile.in 6640fb5fb5a6b85170ed01188bed30d64b22637d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 7a41970464b74225915bcaf9d76efd01f26e08f9
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 3f9f81e908aad6cdc0a16ec52f4ec46d89fd78bc
-R e89d33aafd8495592eda5de8513bddc3
-U danielk1977
-Z cb17f3c51f7983db13d961825b5ac980
+P 85585f11049c4c3278dc2732676b0caa44cf1e9d
+R be1eab5cdc46226b0bbd551808ef1f93
+U mlcreech
+Z 676a611a1be445df78b935d8e115bd76

diff --git a/manifest.uuid b/manifest.uuid
index c6eb1164002166d63cb94e25da82a369852d6c11..4b466b4fbacc3267a7e9431b56fdeb5b1f49e361 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85585f11049c4c3278dc2732676b0caa44cf1e9d
\ No newline at end of file
+b57fc81c3d5f6c7091bdd37f8164887f990a5128
\ No newline at end of file