# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
-all: sqlite3.h libsqlite3.la $(SQLITE3_SHELL_TARGET) \
- $(libtclsqlite3.la_$(HAVE_TCL))
-Makefile: $(TOP)/Makefile.in
- ./config.status
+all: sqlite3.h sqlite3.c shell.c $(SQLITE3_SHELL_TARGET)
+#all: libsqlite3.la \
+#XX# $(libtclsqlite3.la_$(HAVE_TCL))
+
+# Re-run $(TOP)/configure with the same args invoked to produce this
+# makefile.
+#
+AUTOREMAKE = @SQLITE_AUTOREMAKE@
+
+Makefile: $(TOP)/Makefile.in $(AS_AUTO_DEF)
+ $(AUTOREMAKE)
+ @touch $@
+
+sqlite3.pc: $(TOP)/sqlite3.pc.in $(AS_AUTO_DEF)
+ $(AUTOREMAKE)
+ @touch $@
+
+sqlite_cfg.h: $(TOP)/sqlite_cfg.h.in $(AS_AUTO_DEF)
+ $(AUTOREMAKE)
+ @touch $@
+
+libsqlite3.DLL = libsqlite3$(TDLL)
+libsqlite3.LIB = libsqlite3$(TLIB)
+LDFLAGS_libsqlite = \
+ $(LDFLAGS_RPATH) $(TLIBS) $(LDFLAGS_MATH) $(LDFLAGS_ZLIB)
+# LDFLAGS_libsqlite should be used with any target which
+# either results in building libsqlite3.so, builds sqlite3.c
- # directly, links in sqlite3.o, or links in $(LIBOBJS0).
++# directly, links in either of $(LIBOBJSO) or $(LIBOBJS1).
-sqlite3.pc: $(TOP)/sqlite3.pc.in
- ./config.status
+$(libsqlite3.DLL): $(LIBOBJ)
+ $(TLINK) -o $@ \
+ @SHOBJ_LDFLAGS@ $(LIBOBJ) $(TLIBS) \
+ $(LDFLAGS_libsqlite)
+dll: $(libsqlite3.DLL)
+all: dll
-libsqlite3.la: $(LIBOBJ)
- $(LTLINK) -no-undefined -o $@ $(LIBOBJ) $(TLIBS) \
- ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
+$(libsqlite3.LIB): $(LIBOBJ)
+ $(AR) crs $@ $(LIBOBJ)
+lib: $(libsqlite3.LIB)
+all: lib
-libtclsqlite3.la: tclsqlite.lo libsqlite3.la
- $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
- -rpath "$(TCLLIBDIR)" \
- -version-info "8:6:8" \
- -avoid-version
+#XX#libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+#XX# $(TLINK) -no-undefined -o $@ tclsqlite.lo \
+#XX# libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+#XX# -rpath "$(TCLLIBDIR)" \
+#XX# -version-info "8:6:8" \
+#XX# -avoid-version
sqlite3$(TEXE): shell.c sqlite3.c
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+ $(TCC) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
shell.c sqlite3.c \
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
+ $(LDFLAGS_libsqlite) $(LDFLAGS_READLINE)
+cli: sqlite3$(TEXE)
+all: cli
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.lo sqlite3.h
- $(LTLINK) -I$(TOP)/ext/misc -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.o sqlite3.h
+ $(TLINK) $(CFLAGS_stdio3) -o $@ $(TOP)/tool/sqldiff.c sqlite3.o $(LDFLAGS_libsqlite)
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
+dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.o sqlite3.h
+ $(TLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.o $(LDFLAGS_libsqlite)
RSYNC_SRC = \
$(TOP)/tool/sqlite3-rsync.c \
rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
- rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl
- rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE)
+ rm -f *.dll *.lib *.exp *.pc *.vsix *.so *.dylib pkgIndex.tcl
- rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE)
++ rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE) sqlite3_expert$(TEXE)
rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE)
rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
rm -f threadtest5$(TEXE)
#
clean: tidy
rm -rf omittest* testrunner* testdir*
- -gmake -C ext/wasm clean
++ -gmake -C ext/wasm distclean
# Clean up everything. No exceptions.
--#
distclean: clean
- rm -f sqlite_cfg.h config.log config.status $(BTCL) Makefile $(LIBTOOL)
- rm -f sqlite_cfg.h config.log config.status Makefile $(LIBTOOL)
++ rm -f sqlite_cfg.h config.log config.status $(JIMSH) Makefile
+ -gmake -C ext/wasm distclean
-#
-# Windows section
-#
-dll: sqlite3.dll
-
-REAL_LIBOBJ = $(LIBOBJ:%.lo=.libs/%.o)
-
-$(REAL_LIBOBJ): $(LIBOBJ)
-
-sqlite3.def: $(REAL_LIBOBJ)
- echo 'EXPORTS' >sqlite3.def
- nm $(REAL_LIBOBJ) | grep ' T ' | grep ' _sqlite3_' \
- | sed 's/^.* _//' >>sqlite3.def
-
-sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
- $(TCC) -shared -o $@ sqlite3.def \
- -Wl,"--strip-all" $(REAL_LIBOBJ)
-
-#
-# Fiddle app
-#
-fiddle: sqlite3.c shell.c
- make -C ext/wasm fiddle emcc_opt=-Os
-
-#
-# Spell-checking for source comments
-# The sources checked are either C sources or C source templates.
-# Their comments are extracted and processed through aspell using
-# a custom dictionary that contains scads of odd identifiers that
-# find their way into the comments.
-#
-# Currently, this target is setup to be "made" in-tree only.
-# The output is ephemeral. Redirect it to guide spelling fixups,
-# either to correct spelling or add words to tool/custom.txt.
-#
-./custom.rws: ./tool/custom.txt
- @echo 'Updating custom dictionary from tool/custom.txt'
- aspell --lang=en create master ./custom.rws < $<
-
-misspell: ./custom.rws has_tclsh84
- $(TCLSH_CMD) ./tool/spellsift.tcl ./src/*.c ./src/*.h ./src/*.in
-
+#XX##
+#XX## Windows section
+#XX##
+#XX#dll: sqlite3.dll
+#XX#
+#XX#REAL_LIBOBJ = $(LIBOBJ:%.lo=.libs/%.o)
+#XX#
+#XX#$(REAL_LIBOBJ): $(LIBOBJ)
+#XX#
+#XX#sqlite3.def: $(REAL_LIBOBJ)
+#XX# echo 'EXPORTS' >sqlite3.def
+#XX# nm $(REAL_LIBOBJ) | grep ' T ' | grep ' _sqlite3_' \
+#XX# | sed 's/^.* _//' >>sqlite3.def
+#XX#
+#XX#sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
+#XX# $(TCC) -shared -o $@ sqlite3.def \
+#XX# -Wl,"--strip-all" $(REAL_LIBOBJ)
+#XX#
+#XX##
+#XX## Fiddle app
+#XX##
+#XX#fiddle: sqlite3.c shell.c
+#XX# make -C ext/wasm fiddle emcc_opt=-Os
+#XX#
+#XX##
+#XX## Spell-checking for source comments
+#XX## The sources checked are either C sources or C source templates.
+#XX## Their comments are extracted and processed through aspell using
+#XX## a custom dictionary that contains scads of odd identifiers that
+#XX## find their way into the comments.
+#XX##
+#XX## Currently, this target is setup to be "made" in-tree only.
+#XX## The output is ephemeral. Redirect it to guide spelling fixups,
+#XX## either to correct spelling or add words to tool/custom.txt.
+#XX##
+#XX#./custom.rws: ./tool/custom.txt
+#XX# @echo 'Updating custom dictionary from tool/custom.txt'
+#XX# aspell --lang=en create master ./custom.rws < $<
+#XX#
+#XX#misspell: ./custom.rws has_tclsh84
+#XX# $(TCLSH_CMD) ./tool/spellsift.tcl ./src/*.c ./src/*.h ./src/*.in
+#XX#
#
# tool/version-info: a utility for emitting sqlite3 version info
# in various forms.
- C Get\smore\sof\sthe\sCLI\sutils\sbuilding.
- D 2024-10-01T13:40:59.914
-C Add\sext/wasm\sto\sthe\stop-level\sclean/distclean\srules\sin\ssuch\sa\sway\sthat\sany\serror\sdue\sto\sa\slack\sof\sgmake\sare\signored.
-D 2024-10-05T12:02:17.445
++C Merge\strunk\sinto\sautosetup\sbranch.
++D 2024-10-05T12:06:31.859
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 19afd3c31ea260e22eea118053b97d79f2b8d40b5d388e2c9c8a573554b97d4d
-F Makefile.in 71c69b6eb6d8a5e2d418ab80d16f3621099d58f8afabe4ab0d7240c5ca57494a
++F Makefile.in fc3b3656ee35ba81f492a5db71f3eef8f3fd789f04416cfa1fd51533933c5d9a
F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
F Makefile.msc 9c6d80d9d103fa42e931f4c464884a5e577fae8563acc7589bff4e43fbe8f864
F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 98bbba3a05734e080a0c8c51fac0368436809d4ff3c39959a51970400b4470cb
- R d61b1bae6c19264b9c460b550873251d
-P 6733893f450097e07cbd563d6a46790825fd0689283d60181c09793ce7d5509e
-R 749ae8645be170a25b1c641eade23387
++P 6838b7b5d6130b1e0af9a71ad2c5922b1ef35f082907dffeed03811e1e62406f 2f7eab381e16760952d1c90a9119d2a217933f0136442d8f6eeb6d95e366ca4f
++R 718af76a1b8b829ff662e805c69f5727
U stephan
- Z 5f773d8b1897a9c16436ea21d9b0af59
-Z c3b0bf3081778b6e6721957f472a53c9
++Z d5ebe1dc79c6b40a021966341f66c463
# Remove this line to create a well-formed Fossil manifest.