Skip to content

Commit 47e8413

Browse files
sjlombardosjlombardo
committed
Merge branch 'deb' into prerelease-int
Conflicts: Makefile.in VERSION configure
2 parents 297e94d + 94915f3 commit 47e8413

6 files changed

Lines changed: 464 additions & 46 deletions

File tree

‎Makefile.in‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ exec_prefix = @exec_prefix@
153153
libdir = @libdir@
154154
pkgconfigdir = $(libdir)/pkgconfig
155155
bindir = @bindir@
156-
includedir = @includedir@
156+
includedir = @includedir@/sqlcipher
157157
INSTALL = @INSTALL@
158158
LIBTOOL = ./libtool
159159
ALLOWRELEASE = @ALLOWRELEASE@
@@ -503,28 +503,28 @@ EXTHDR += \
503503
# This is the default Makefile target. The objects listed here
504504
# are what get build when you type just "make" with no arguments.
505505
#
506-
all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
506+
all: sqlite3.h libsqlcipher.la sqlcipher$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
507507

508508
Makefile: $(TOP)/Makefile.in
509509
./config.status
510510

511-
sqlite3.pc: $(TOP)/sqlite3.pc.in
511+
sqlcipher.pc: $(TOP)/sqlcipher.pc.in
512512
./config.status
513513

514-
libsqlite3.la: $(LIBOBJ)
514+
libsqlcipher.la: $(LIBOBJ)
515515
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
516516
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
517517

518-
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
518+
libtclsqlite3.la: tclsqlite.lo libsqlcipher.la
519519
$(LTLINK) -o $@ tclsqlite.lo \
520-
libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
520+
libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
521521
-rpath "$(TCLLIBDIR)" \
522522
-version-info "8:6:8" \
523523
-avoid-version
524524

525-
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
525+
sqlcipher$(TEXE): $(TOP)/src/shell.c libsqlcipher.la sqlite3.h
526526
$(LTLINK) $(READLINE_FLAGS) \
527-
-o $@ $(TOP)/src/shell.c libsqlite3.la \
527+
-o $@ $(TOP)/src/shell.c libsqlcipher.la \
528528
$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
529529

530530
mptester$(EXE): sqlite3.c $(TOP)/mptest/mptest.c
@@ -808,9 +808,9 @@ tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR)
808808
tclsqlite-stubs.lo: $(TOP)/src/tclsqlite.c $(HDR)
809809
$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
810810

811-
tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
811+
tclsqlcipher$(TEXE): tclsqlite-shell.lo libsqlcipher.la
812812
$(LTLINK) -o $@ tclsqlite-shell.lo \
813-
libsqlite3.la $(LIBTCL)
813+
libsqlcipher.la $(LIBTCL)
814814

815815
# Rules to build opcodes.c and opcodes.h
816816
#
@@ -909,15 +909,15 @@ rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
909909
# Rules to build the 'testfixture' application.
910910
#
911911
# If using the amalgamation, use sqlite3.c directly to build the test
912-
# fixture. Otherwise link against libsqlite3.la. (This distinction is
912+
# fixture. Otherwise link against libsqlcipher.la. (This distinction is
913913
# necessary because the test fixture requires non-API symbols which are
914914
# hidden when the library is built via the amalgamation).
915915
#
916916
TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
917917
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
918918
TESTFIXTURE_FLAGS += -DBUILD_sqlite
919919

920-
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
920+
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
921921
TESTFIXTURE_SRC1 = sqlite3.c
922922
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
923923
TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
@@ -927,16 +927,16 @@ testfixture$(TEXE): $(TESTFIXTURE_SRC)
927927
-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
928928

929929

930-
fulltest: testfixture$(TEXE) sqlite3$(TEXE)
930+
fulltest: testfixture$(TEXE) sqlcipher$(TEXE)
931931
./testfixture$(TEXE) $(TOP)/test/all.test
932932

933-
soaktest: testfixture$(TEXE) sqlite3$(TEXE)
933+
soaktest: testfixture$(TEXE) sqlcipher$(TEXE)
934934
./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
935935

936-
fulltestonly: testfixture$(TEXE) sqlite3$(TEXE)
936+
fulltestonly: testfixture$(TEXE) sqlcipher$(TEXE)
937937
./testfixture$(TEXE) $(TOP)/test/full.test
938938

939-
test: testfixture$(TEXE) sqlite3$(TEXE)
939+
test: testfixture$(TEXE) sqlcipher$(TEXE)
940940
./testfixture$(TEXE) $(TOP)/test/veryquick.test
941941

942942
sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
@@ -952,18 +952,18 @@ sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
952952

953953
# Standard install and cleanup targets
954954
#
955-
lib_install: libsqlite3.la
955+
lib_install: libsqlcipher.la
956956
$(INSTALL) -d $(DESTDIR)$(libdir)
957-
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
957+
$(LTINSTALL) libsqlcipher.la $(DESTDIR)$(libdir)
958958

959-
install: sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
959+
install: sqlcipher$(BEXE) lib_install sqlite3.h sqlcipher.pc ${HAVE_TCL:1=tcl_install}
960960
$(INSTALL) -d $(DESTDIR)$(bindir)
961-
$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
961+
$(LTINSTALL) sqlcipher$(BEXE) $(DESTDIR)$(bindir)
962962
$(INSTALL) -d $(DESTDIR)$(includedir)
963963
$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
964964
$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
965965
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
966-
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
966+
$(INSTALL) -m 0644 sqlcipher.pc $(DESTDIR)$(pkgconfigdir)
967967

968968
pkgIndex.tcl:
969969
echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@
@@ -974,15 +974,15 @@ tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
974974
$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
975975

976976
clean:
977-
rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
977+
rm -f *.lo *.la *.o sqlcipher$(TEXE) libsqlcipher.la
978978
rm -f sqlite3.h opcodes.*
979979
rm -rf .libs .deps
980980
rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
981981
rm -f mkkeywordhash$(BEXE) keywordhash.h
982982
rm -f *.da *.bb *.bbg gmon.out
983983
rm -rf quota2a quota2b quota2c
984984
rm -rf tsrc .target_source
985-
rm -f tclsqlite3$(TEXE)
985+
rm -f tclsqlcipher$(TEXE)
986986
rm -f testfixture$(TEXE) test.db
987987
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
988988
rm -f sqlite3.c
@@ -993,7 +993,7 @@ clean:
993993
rm -f mptester mptester.exe
994994

995995
distclean: clean
996-
rm -f config.log config.status libtool Makefile sqlite3.pc
996+
rm -f config.log config.status libtool Makefile sqlcipher.pc
997997

998998
#
999999
# Windows section

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.17
1+
2.1.1

0 commit comments

Comments
 (0)