-
-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Building the SQLite3 shell with a static SQLite3 library failed for the autoconf tool chain. Makefile.am has been adjusted to always build the SQLite3 library as an integrated part of the shell.
- Loading branch information
Showing
1 changed file
with
8 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,8 +8,8 @@ ACLOCAL_AMFLAGS = -I ../admin/m4 | |
|
||
# Flags used for compiling all the targets and linking all the executables | ||
# (libraries use LIBADD which is set for lib@[email protected] only). | ||
AM_CXXFLAGS = -I$(top_srcdir)/src $(WX_CXXFLAGS) | ||
AM_CFLAGS = -I$(top_srcdir)/src $(WX_CXXFLAGS) | ||
AM_CXXFLAGS = -I$(top_srcdir)/src | ||
AM_CFLAGS = -I$(top_srcdir)/src | ||
|
||
AM_CFLAGS += -std=c99 -DTHREADSAFE=1 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_HAS_CODEC -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_CORE -DSQLITE_ENABLE_EXTFUNC -DSQLITE_ENABLE_CSV -DSQLITE_ENABLE_SHA3 -DSQLITE_ENABLE_CARRAY -DSQLITE_ENABLE_FILEIO -DSQLITE_ENABLE_SERIES -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI -DSQLITE_USER_AUTHENTICATION | ||
|
||
|
@@ -71,9 +71,13 @@ lib@SQLITE3SECURE_LIBNAME@_la_LIBADD = -ldl -lm | |
noinst_PROGRAMS = sqlite3shell | ||
|
||
sqlite3shell_SOURCES = \ | ||
src/sqlite3secure.c \ | ||
src/shell.c | ||
|
||
sqlite3shell_LDADD = $(LDADD) -ldl -lm | ||
sqlite3shell_CFLAGS = -I$(top_srcdir)/src -std=c99 -DTHREADSAFE=1 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_HAS_CODEC -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_CORE -DSQLITE_ENABLE_EXTFUNC -DSQLITE_ENABLE_CSV -DSQLITE_ENABLE_CARRAY -DSQLITE_ENABLE_SERIES -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI -DSQLITE_USER_AUTHENTICATION | ||
|
||
sqlite3shell_LDADD = -ldl -lm | ||
sqlite3shell_LDFLAGS = -pthread | ||
|
||
if USE_MSW | ||
sqlite3shell_SOURCES += src/sqlite3shell.rc | ||
|
@@ -82,6 +86,6 @@ CLEANFILES = src/sqlite3shell.res_o | |
else | ||
# libtool complains about unknown "-no-install" option when targetting MSW, so | ||
# use it only in the "else" branch. | ||
sqlite3shell_LDFLAGS = -no-install | ||
sqlite3shell_LDFLAGS += -no-install | ||
endif | ||
|