8000 Merge branch 'prerelease' · magic-coder/sqlcipher@e7b8d1f · GitHub
[go: up one dir, main page]

Skip to content

Commit e7b8d1f

Browse files
Merge branch 'prerelease'
2 parents 9096584 + c0b9920 commit e7b8d1f

File tree

202 files changed

+13211
-3523
lines changed

Some content is hidden

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

202 files changed

+13211
-3523
lines changed

Makefile.in

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,10 @@ SRC = \
259259
$(TOP)/src/os.c \
260260
$(TOP)/src/os.h \
261261
$(TOP)/src/os_common.h \
262+
$(TOP)/src/os_setup.h \
262263
$(TOP)/src/os_unix.c \
263264
$(TOP)/src/os_win.c \
265+
$(TOP)/src/os_win.h \
264266
$(TOP)/src/pager.c \
265267
$(TOP)/src/pager.h \
266268
$(TOP)/src/parse.y \
@@ -411,6 +413,7 @@ TESTSRC = \
411413
TESTSRC += \
412414
$(TOP)/ext/misc/amatch.c \
413415
$(TOP)/ext/misc/closure.c \
416+
$(TOP)/ext/misc/fileio.c \
414417
$(TOP)/ext/misc/fuzzer.c \
415418
$(TOP)/ext/misc/ieee754.c \
416419
$(TOP)/ext/misc/nextchar.c \
@@ -477,6 +480,8 @@ HDR = \
477480
opcodes.h \
478481
$(TOP)/src/os.h \
479482
$(TOP)/src/os_common.h \
483+
$(TOP)/src/os_setup.h \
484+
$(TOP)/src/os_win.h \
480485
$(TOP)/src/pager.h \
481486
$(TOP)/src/pcache.h \
482487
parse.h \
@@ -967,8 +972,23 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TO
967972
sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
968973
$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
969974

970-
showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.c
971-
$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.c $(TLIBS)
975+
showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
976+
$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
977+
978+
showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
979+
$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
980+
981+
showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
982+
$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
983+
984+
showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
985+
$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
986+
987+
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
988+
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
9346 989+
990+
LogEst$(TEXE): $(TOP)/tool/logest.c sqlite3.h
991+
$(LTLINK) -I. -o $@ $(TOP)/tool/logest.c
972992

973993
wordcount$(TEXE): $(TOP)/test/wordcount.c sqlite3.c
974994
$(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.c $(TLIBS)
@@ -1010,6 +1030,9 @@ clean:
10101030
rm -rf tsrc .target_source
10111031
rm -f tclsqlcipher$(TEXE)
10121032
rm -f testfixture$(TEXE) test.db
1033+
rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
1034+
rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
1035+
rm -f wordcount$(TEXE)
10131036
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
10141037
rm -f sqlite3.c
10151038
rm -f sqlite3rc.h

0 commit comments

Comments
 (0)
0