Skip to content

Commit 1a81194

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into merge-3.6.17
2 parents 4c95e61 + db1d641 commit 1a81194

191 files changed

Lines changed: 28913 additions & 20612 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,16 +499,18 @@ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
499499
mkdir -p tsrc
500500
cp $(SRC) tsrc
501501
rm tsrc/sqlite.h.in tsrc/parse.y
502+
$(TCLSH_CMD) $(TOP)/tool/vdbe-compress.tcl <tsrc/vdbe.c >vdbe.new
503+
mv vdbe.new tsrc/vdbe.c
502504
touch .target_source
503505

504506
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
505507
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
506508

507509
# Rules to build the LEMON compiler generator
508510
#
509-
lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
511+
lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
510512
$(BCC) -o $@ $(TOP)/tool/lemon.c
511-
cp $(TOP)/tool/lempar.c .
513+
cp $(TOP)/src/lempar.c .
512514

513515

514516
# Rule to build the amalgamation

‎Makefile.vxworks‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,9 @@ fts3amal.c: target_source $(TOP)/ext/fts3/mkfts3amal.tcl
489489

490490
# Rules to build the LEMON compiler generator
491491
#
492-
lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
492+
lemon: $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
493493
$(BCC) -o lemon $(TOP)/tool/lemon.c
494-
cp $(TOP)/tool/lempar.c .
494+
cp $(TOP)/src/lempar.c .
495495

496496
# Rules to build individual *.o files from generated *.c files. This
497497
# applies to:

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.14
1+
3.6.17

0 commit comments

Comments
 (0)