mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-23 11:22:09 +03:00
Fix out-of-tree builds of the autoconf bundle, as reported in [forum:a0cd0beb1baa6bef|forum post a0cd0beb1baa6bef].
FossilOrigin-Name: d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8
This commit is contained in:
@ -1,8 +1,17 @@
|
|||||||
########################################################################
|
########################################################################
|
||||||
# This is a main makefile for the "autoconf" bundle of SQLite. This is
|
# This is a main makefile for the "autoconf" bundle of SQLite. This is
|
||||||
# a trimmed-down version of the canonical makefile, devoid of most
|
# a trimmed-down version of the canonical makefile, devoid of most
|
||||||
# documentation. For the full docs, see 'main.mk' in the canonical
|
# documentation. For the full docs, see /main.mk in the canonical
|
||||||
# source tree.
|
# source tree.
|
||||||
|
#
|
||||||
|
# Maintenance reminders:
|
||||||
|
#
|
||||||
|
# - To keep this working with an out-of-tree build, be sure to prefix
|
||||||
|
# input file names with $(TOP)/ where appropriate (which is most
|
||||||
|
# places).
|
||||||
|
#
|
||||||
|
# - The original/canonical recipes can be found in /main.mk in the
|
||||||
|
# canonical source tree.
|
||||||
all:
|
all:
|
||||||
|
|
||||||
TOP = @abs_top_srcdir@
|
TOP = @abs_top_srcdir@
|
||||||
@ -123,8 +132,8 @@ LDFLAGS.libsqlite3 = \
|
|||||||
LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@
|
LDFLAGS.libsqlite3.soname = @LDFLAGS_LIBSQLITE3_SONAME@
|
||||||
CFLAGS.libsqlite3 = -I. $(CFLAGS.core) $(CFLAGS.icu) $(OPT_FEATURE_FLAGS)
|
CFLAGS.libsqlite3 = -I. $(CFLAGS.core) $(CFLAGS.icu) $(OPT_FEATURE_FLAGS)
|
||||||
|
|
||||||
sqlite3.o: sqlite3.h sqlite3.c
|
sqlite3.o: $(TOP)/sqlite3.h $(TOP)/sqlite3.c
|
||||||
$(CC) -c sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3)
|
$(CC) -c $(TOP)/sqlite3.c -o $@ $(CFLAGS) $(CFLAGS.libsqlite3)
|
||||||
|
|
||||||
libsqlite3.LIB = libsqlite3$(T.lib)
|
libsqlite3.LIB = libsqlite3$(T.lib)
|
||||||
libsqlite3.SO = libsqlite3$(T.dll)
|
libsqlite3.SO = libsqlite3$(T.dll)
|
||||||
@ -169,9 +178,9 @@ install-lib: install-lib-$(ENABLE_LIB_STATIC)
|
|||||||
install: install-lib
|
install: install-lib
|
||||||
|
|
||||||
|
|
||||||
sqlite3$(T.exe): shell.c sqlite3.c
|
sqlite3$(T.exe): $(TOP)/shell.c $(TOP)/sqlite3.c
|
||||||
$(CC) -o $@ \
|
$(CC) -o $@ \
|
||||||
shell.c sqlite3.c \
|
$(TOP)/shell.c $(TOP)/sqlite3.c \
|
||||||
-I. $(OPT_FEATURE_FLAGS) $(SHELL_OPT) \
|
-I. $(OPT_FEATURE_FLAGS) $(SHELL_OPT) \
|
||||||
$(CFLAGS) $(CFLAGS.readline) $(CFLAGS.icu) \
|
$(CFLAGS) $(CFLAGS.readline) $(CFLAGS.icu) \
|
||||||
$(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
|
$(LDFLAGS) $(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
|
||||||
@ -181,16 +190,16 @@ install-shell: sqlite3$(T.exe) $(install-dir.bin)
|
|||||||
$(INSTALL.strip) sqlite3$(T.exe) "$(install-dir.bin)"
|
$(INSTALL.strip) sqlite3$(T.exe) "$(install-dir.bin)"
|
||||||
install: install-shell
|
install: install-shell
|
||||||
|
|
||||||
install-headers: sqlite3.h $(install-dir.include)
|
install-headers: $(TOP)/sqlite3.h $(install-dir.include)
|
||||||
$(INSTALL.noexec) sqlite3.h sqlite3ext.h "$(install-dir.include)"
|
$(INSTALL.noexec) $(TOP)/sqlite3.h $(TOP)/sqlite3ext.h "$(install-dir.include)"
|
||||||
install: install-headers
|
install: install-headers
|
||||||
|
|
||||||
install-pc: sqlite3.pc $(install-dir.pkgconfig)
|
install-pc: sqlite3.pc $(install-dir.pkgconfig)
|
||||||
$(INSTALL.noexec) sqlite3.pc "$(install-dir.pkgconfig)"
|
$(INSTALL.noexec) sqlite3.pc "$(install-dir.pkgconfig)"
|
||||||
install: install-pc
|
install: install-pc
|
||||||
|
|
||||||
install-man1: sqlite3.1 $(install-dir.man1)
|
install-man1: $(TOP)/sqlite3.1 $(install-dir.man1)
|
||||||
$(INSTALL.noexec) sqlite3.1 "$(install-dir.man1)"
|
$(INSTALL.noexec) $(TOP)/sqlite3.1 "$(install-dir.man1)"
|
||||||
install: install-man1
|
install: install-man1
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
|||||||
C Bump\sTEA\sconfigure.ac\sversion\snumber.
|
C Fix\sout-of-tree\sbuilds\sof\sthe\sautoconf\sbundle,\sas\sreported\sin\s[forum:a0cd0beb1baa6bef|forum\spost\sa0cd0beb1baa6bef].
|
||||||
D 2025-02-07T01:43:05.809
|
D 2025-02-07T11:15:58.181
|
||||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||||
F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
|
F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
|
||||||
@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
|
|||||||
F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
|
F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
|
||||||
F auto.def e7e92090c98aeb0174d29988c259834eb1b71ae1ea927015c3ef300f6f9b68ae
|
F auto.def e7e92090c98aeb0174d29988c259834eb1b71ae1ea927015c3ef300f6f9b68ae
|
||||||
F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
|
F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
|
||||||
F autoconf/Makefile.in 56697ad25ecf23afa317148b06bdc14f85960b42e5ec434ac1ba87f63a3cb789
|
F autoconf/Makefile.in 1748696041b706722fcc2289630aec596e556e10677914ec1dd5de9c627324fa
|
||||||
F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4
|
F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4
|
||||||
F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
|
F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
|
||||||
F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
|
F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
|
||||||
@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
|
|||||||
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
||||||
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
|
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
|
||||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||||
P e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c
|
P a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa
|
||||||
R 862fe61394e7b3cb4c5d861b55c28308
|
R b8a9ec2caf630431b78b8fafa6d467ea
|
||||||
U stephan
|
U stephan
|
||||||
Z 4a5b39d46ead9ead0e536423680a6ea5
|
Z 0e72d164ec413ce5120bfc7018dcffe2
|
||||||
# Remove this line to create a well-formed Fossil manifest.
|
# Remove this line to create a well-formed Fossil manifest.
|
||||||
|
@ -1 +1 @@
|
|||||||
a1a9c780d1f1b47b0408397edded9c5d230c7b144207ad142d06c048792d31fa
|
d47964a65bcfd4bc0b06baca281467a0b7fc87eba912a19c0974f63a54928ff8
|
||||||
|
Reference in New Issue
Block a user