Build amalgamation by default on autoconf-driven builds, add

--disable-amalgamation option to configure script (CVS 4820)

FossilOrigin-Name: f9391fa06f22aea5c6af9e1c76d7f5404483189a

Makefile.in

@@ -118,20 +118,30 @@ NAWK = @AWK@
 ###############################################################################
 TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
 
-# Object files for the SQLite library.
+# Object files for the SQLite library (non-amalgamation).
 #
-LIBOBJ = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo btree.lo \
-         build.lo callback.lo complete.lo date.lo \
-         delete.lo expr.lo fault.lo func.lo \
-         hash.lo journal.lo insert.lo loadext.lo \
-         main.lo malloc.lo mem1.lo mem2.lo mem3.lo mem4.lo mem5.lo mutex.lo \
-         mutex_os2.lo mutex_unix.lo mutex_w32.lo \
-         opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
-         pager.lo parse.lo pragma.lo prepare.lo printf.lo random.lo \
-         select.lo table.lo tokenize.lo trigger.lo update.lo \
-         util.lo vacuum.lo \
-         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
-         where.lo utf.lo legacy.lo vtab.lo
+OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
+        btree.lo build.lo callback.lo complete.lo date.lo \
+        delete.lo expr.lo fault.lo func.lo \
+        hash.lo journal.lo insert.lo loadext.lo \
+        main.lo malloc.lo mem1.lo mem2.lo mem3.lo mem4.lo mem5.lo mutex.lo \
+        mutex_os2.lo mutex_unix.lo mutex_w32.lo \
+        opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
+        pager.lo parse.lo pragma.lo prepare.lo printf.lo random.lo \
+        select.lo table.lo tokenize.lo trigger.lo update.lo \
+        util.lo vacuum.lo \
+        vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
+        where.lo utf.lo legacy.lo vtab.lo
+
+# Object files for the amalgamation.
+#
+OBJS1 = sqlite3.lo
+
+# Determine the real value of LIBOBJ based on the 'configure' script
+#
+USE_AMALGAMATION = @USE_AMALGAMATION@
+LIBOBJ = $(OBJS$(USE_AMALGAMATION))
+
 
 # All of the source code files.
 #
@@ -365,14 +375,15 @@ sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
 # files are automatically generated.  This target takes care of
 # all that automatic generation.
 #
-target_source:	$(SRC) parse.c opcodes.c keywordhash.h $(VDBEHDR) 
+.target_source:	$(SRC) parse.c opcodes.c keywordhash.h $(VDBEHDR) 
 	rm -rf tsrc
 	mkdir -p tsrc
 	cp $(SRC) $(VDBEHDR) tsrc
 	rm tsrc/sqlite.h.in tsrc/parse.y
 	cp parse.c opcodes.c keywordhash.h tsrc
+	touch .target_source
 
-sqlite3.c:	target_source $(TOP)/tool/mksqlite3c.tcl
+sqlite3.c:	.target_source $(TOP)/tool/mksqlite3c.tcl
 	tclsh $(TOP)/tool/mksqlite3c.tcl
 
 # Rules to build the LEMON compiler generator
@@ -382,6 +393,11 @@ lemon$(BEXE):	$(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
 	cp $(TOP)/tool/lempar.c .
 
 
+# Rule to build the amalgamation
+#
+sqlite3.lo:	sqlite3.c
+	$(LTCOMPILE) -c $(TOP)/sqlite3.c
+
 # Rules to build individual files
 #
 alter.lo:	$(TOP)/src/alter.c $(HDR)
@@ -645,6 +661,7 @@ clean:
 	rm -f testfixture$(TEXE) test.db
 	rm -f common.tcl
 	rm -f sqlite3.dll sqlite3.lib sqlite3.def
+	rm -f .target_source
 
 distclean:	clean
 	rm -f config.log config.status libtool Makefile config.h sqlite3.pc

configure.ac

@@ -92,7 +92,7 @@ AC_INIT(src/sqlite.h.in)
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.31 $
+# $Revision: 1.32 $
 
 #########
 # Programs needed
@@ -562,6 +562,18 @@ else
 fi
 AC_SUBST(TARGET_DEBUG)
 
+#########
+# See whether we should use the amalgamation to build
+AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation],
+      [Disable the amalgamation and instead build all files separately (currently needed to build the test fixture)]),
+      [use_amalgamation=$enableval],[use_amalgamation=yes])
+if test "${use_amalgamation}" = "yes" ; then
+  USE_AMALGAMATION=1
+else
+  USE_AMALGAMATION=0
+fi
+AC_SUBST(USE_AMALGAMATION)
+
 #########
 # Figure out whether or not we have a "usleep()" function.
 #

manifest

@@ -1,7 +1,7 @@
-C Various\srenames\s&\scleanups\sto\slimit\sexported\ssymbols\son\samalgamation\sbuild\s(CVS\s4819)
-D 2008-03-04T17:45:01
+C Build\samalgamation\sby\sdefault\son\sautoconf-driven\sbuilds,\sadd\n--disable-amalgamation\soption\sto\sconfigure\sscript\s(CVS\s4820)
+D 2008-03-04T19:03:08
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in 189c76bd261ed4e378904a3d81fc4bc12e23cddc
+F Makefile.in e18597f1f36c530260692d52a4e3785825265d60
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 2e206fc9458bf10a8c3ba2d13bf521a04ef441c6
@@ -16,8 +16,8 @@ F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f
 F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1
 F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c
 F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796
-F configure 489e662ca1d1b03e526898d737064f7d0a7f3b4e x
-F configure.ac a4462127fedc9127cc103e9d358839404942c84c
+F configure f8b0454f30c4d3beb4b4978b97743381b51c6494 x
+F configure.ac e39ab14107eb49ba9c342155e05f1d987f5b1a61
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -621,7 +621,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 39769f00c5d9ea20ad5d1c0569464529e953fa9d
-R 989d1372e5046c9b4e9419504e12ed31
+P 9c6694bb61a8ecdbfb2d05e5e05a8cc97b792240
+R f6b04bb89c3105668b926378100c262b
 U mlcreech
-Z a5aa8288c3332a3814c7c41240628252
+Z 19aacec2cb03987f02ce862f80a0df8d

manifest.uuid

@@ -1 +1 @@
-9c6694bb61a8ecdbfb2d05e5e05a8cc97b792240
+f9391fa06f22aea5c6af9e1c76d7f5404483189a