/ Check-in [a3204d8a]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the main.mk makefile so that the sqlrr extension is built into the amalgamation correctly.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: a3204d8a217d47e5120ab16918c1b7d4be5a021e
User & Date: drh 2009-12-23 18:06:50
Context
2010-01-06
13:12
Update the OS-X branch to include all trunk changes through version 3.6.22. check-in: 541e2b48 user: drh tags: apple-osx
2009-12-23
18:06
Fix the main.mk makefile so that the sqlrr extension is built into the amalgamation correctly. check-in: a3204d8a user: drh tags: apple-osx
2009-12-16
23:46
Merge the latest changes on trunk (and especially the fix for the (xANDy)OR(z) bug) into apple-osx. check-in: 5754a3a5 user: drh tags: apple-osx
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to main.mk.

   196    196     $(TOP)/ext/fts3/fts3_write.c
   197    197   SRC += \
   198    198     $(TOP)/ext/icu/sqliteicu.h \
   199    199     $(TOP)/ext/icu/icu.c
   200    200   SRC += \
   201    201     $(TOP)/ext/rtree/rtree.h \
   202    202     $(TOP)/ext/rtree/rtree.c
          203  +SRC += \
          204  +  $(TOP)/ext/sqlrr/sqlrr.c
   203    205   
   204    206   
   205    207   # Generated source code files
   206    208   #
   207    209   SRC += \
   208    210     keywordhash.h \
   209    211     opcodes.c \
................................................................................
   302    304     $(TOP)/ext/fts3/fts3Int.h \
   303    305     $(TOP)/ext/fts3/fts3_hash.h \
   304    306     $(TOP)/ext/fts3/fts3_tokenizer.h
   305    307   EXTHDR += \
   306    308     $(TOP)/ext/rtree/rtree.h
   307    309   EXTHDR += \
   308    310     $(TOP)/ext/icu/sqliteicu.h
          311  +EXTHDR += \
          312  +  $(TOP)/ext/sqlrr/sqlrr.h
   309    313   
   310    314   # This is the default Makefile target.  The objects listed here
   311    315   # are what get build when you type just "make" with no arguments.
   312    316   #
   313    317   all:	sqlite3.h libsqlite3.a sqlite3$(EXE)
   314    318   
   315    319   libsqlite3.a:	$(LIBOBJ)
................................................................................
   325    329   
   326    330   # This target creates a directory named "tsrc" and fills it with
   327    331   # copies of all of the C source code and header files needed to
   328    332   # build on the target system.  Some of the C source code and header
   329    333   # files are automatically generated.  This target takes care of
   330    334   # all that automatic generation.
   331    335   #
   332         -target_source:	$(SRC) $(TOP)/tool/vdbe-compress.tcl
          336  +target_source:	$(SRC) $(EXTHDR) $(TOP)/tool/vdbe-compress.tcl
   333    337   	rm -rf tsrc
   334    338   	mkdir tsrc
   335         -	cp -f $(SRC) tsrc
          339  +	cp -f $(SRC) $(EXTHDR) tsrc
   336    340   	rm tsrc/sqlite.h.in tsrc/parse.y
   337    341   	tclsh $(TOP)/tool/vdbe-compress.tcl <tsrc/vdbe.c >vdbe.new
   338    342   	mv vdbe.new tsrc/vdbe.c
   339    343   	touch target_source
   340    344   
   341    345   sqlite3.c:	target_source $(TOP)/tool/mksqlite3c.tcl
   342    346   	tclsh $(TOP)/tool/mksqlite3c.tcl