|
|
@@ -1,35 +1,14 @@
|
|
|
Index: Makefile.in
|
|
|
---- Makefile.in.orig 2009-02-15 14:07:08 +0100
|
|
|
-+++ Makefile.in 2009-02-20 23:23:36 +0100
|
|
|
-@@ -163,7 +163,7 @@
|
|
|
-
|
|
|
- # Object files for the SQLite library (non-amalgamation).
|
|
|
- #
|
|
|
--OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
|
|
|
-+OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
|
|
|
- btree.lo build.lo callback.lo complete.lo date.lo \
|
|
|
- delete.lo expr.lo fault.lo func.lo global.lo \
|
|
|
- hash.lo journal.lo insert.lo legacy.lo loadext.lo \
|
|
|
-@@ -188,6 +188,30 @@
|
|
|
+--- Makefile.in.orig 2009-03-30 18:37:16 +0200
|
|
|
++++ Makefile.in 2009-03-31 20:09:03 +0200
|
|
|
+@@ -187,6 +187,17 @@
|
|
|
+ USE_AMALGAMATION = @USE_AMALGAMATION@
|
|
|
LIBOBJ = $(OBJS$(USE_AMALGAMATION))
|
|
|
|
|
|
-
|
|
|
-+# FTS1 support
|
|
|
-+ifdef FTS1
|
|
|
-+TCC += -DSQLITE_ENABLE_FTS1 -I$(TOP)/ext/fts1
|
|
|
-+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
|
|
|
-+endif
|
|
|
-+
|
|
|
-+# FTS2 support
|
|
|
-+ifdef FTS2
|
|
|
-+TCC += -DSQLITE_ENABLE_FTS2 -I$(TOP)/ext/fts2
|
|
|
-+LIBOBJ += fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
|
|
|
-+endif
|
|
|
-+
|
|
|
+# FTS3 support
|
|
|
+ifdef FTS3
|
|
|
+TCC += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
|
|
|
-+LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
|
|
|
++LIBOBJ += fts3.lo fts3_hash.lo fts3_expr.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
|
|
|
+endif
|
|
|
+
|
|
|
+# RTREE support
|
|
|
@@ -37,47 +16,19 @@ Index: Makefile.in
|
|
|
+TCC += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree
|
|
|
+LIBOBJ += rtree.lo
|
|
|
+endif
|
|
|
-+
|
|
|
+
|
|
|
# All of the source code files.
|
|
|
#
|
|
|
- SRC = \
|
|
|
-@@ -518,6 +542,9 @@
|
|
|
- auth.lo: $(TOP)/src/auth.c $(HDR)
|
|
|
- $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
|
|
|
+@@ -477,6 +488,24 @@
|
|
|
+ -o $@ $(TOP)/src/shell.c libsqlite3.la \
|
|
|
+ $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
|
|
|
|
|
-+backup.lo: $(TOP)/src/backup.c $(HDR)
|
|
|
-+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
|
|
|
-+
|
|
|
- bitvec.lo: $(TOP)/src/bitvec.c $(HDR)
|
|
|
- $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
|
|
|
-
|
|
|
-@@ -817,3 +844,38 @@
|
|
|
- sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
|
|
|
- $(TCC) -shared -o $@ sqlite3.def \
|
|
|
- -Wl,"--strip-all" $(REAL_LIBOBJ)
|
|
|
-+
|
|
|
-+fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
|
|
|
-+fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
|
|
|
-+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
|
|
|
-+fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
|
|
|
-+
|
|
|
-+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
|
|
|
-+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
|
|
|
-+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
|
|
|
-+fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
|
|
|
-+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
|
|
|
-+
|
|
|
+fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR)
|
|
|
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
|
|
|
+fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR)
|
|
|
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
|
|
|
++fts3_expr.lo: $(TOP)/ext/fts3/fts3_expr.c $(HDR)
|
|
|
++ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_expr.c
|
|
|
+fts3_icu.lo: $(TOP)/ext/fts3/fts3_icu.c $(HDR)
|
|
|
+ $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c
|
|
|
+fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR)
|
|
|
@@ -90,20 +41,12 @@ Index: Makefile.in
|
|
|
+rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR)
|
|
|
+ $(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
|
|
|
+
|
|
|
-Index: sqlite3.pc.in
|
|
|
---- sqlite3.pc.in.orig 2009-02-15 14:07:08 +0100
|
|
|
-+++ sqlite3.pc.in 2009-02-20 23:22:48 +0100
|
|
|
-@@ -8,6 +8,5 @@
|
|
|
- Name: SQLite
|
|
|
- Description: SQL database engine
|
|
|
- Version: @RELEASE@
|
|
|
--Libs: -L${libdir} -lsqlite3
|
|
|
--Libs.private: @LIBS@
|
|
|
-+Libs: -L${libdir} -lsqlite3 @LIBS@
|
|
|
- Cflags: -I${includedir}
|
|
|
+ # This target creates a directory named "tsrc" and fills it with
|
|
|
+ # copies of all of the C source code and header files needed to
|
|
|
+ # build on the target system. Some of the C source code and header
|
|
|
Index: configure
|
|
|
---- configure.orig 2009-02-15 14:07:08 +0100
|
|
|
-+++ configure 2009-03-04 23:04:46 +0100
|
|
|
+--- configure.orig 2009-02-18 13:09:06 +0100
|
|
|
++++ configure 2009-03-31 20:06:08 +0200
|
|
|
@@ -5963,13 +5963,7 @@
|
|
|
if $ac_preproc_ok; then
|
|
|
:
|
|
|
@@ -119,3 +62,14 @@ Index: configure
|
|
|
fi
|
|
|
|
|
|
ac_ext=c
|
|
|
+Index: sqlite3.pc.in
|
|
|
+--- sqlite3.pc.in.orig 2009-02-15 14:07:08 +0100
|
|
|
++++ sqlite3.pc.in 2009-03-31 20:06:08 +0200
|
|
|
+@@ -8,6 +8,5 @@
|
|
|
+ Name: SQLite
|
|
|
+ Description: SQL database engine
|
|
|
+ Version: @RELEASE@
|
|
|
+-Libs: -L${libdir} -lsqlite3
|
|
|
+-Libs.private: @LIBS@
|
|
|
++Libs: -L${libdir} -lsqlite3 @LIBS@
|
|
|
+ Cflags: -I${includedir}
|