Skip to content

Commit 9aa946f

Browse files
committed
When using the --out-implib build option, install the generated .dll.a file to PREFIX/lib.
1 parent f70b88c commit 9aa946f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

autoconf/Makefile.in

+4-1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ all: $(libsqlite3.LIB)
157157

158158
install-so-1: $(install-dir.lib) $(libsqlite3.SO)
159159
$(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)"
160+
@if [ -f $(libsqlite3.SO).a ]; then \
161+
$(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \
162+
fi
160163
@echo "Setting up $(libsqlite3.SO) version symlinks..."; \
161164
cd "$(install-dir.lib)" || exit $$?; \
162165
if [ x.dylib = x$(T.dll) ]; then \
@@ -171,7 +174,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO)
171174
mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \
172175
ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \
173176
ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \
174-
ls -la $(libsqlite3.SO) $(libsqlite3.SO).[03]*; \
177+
ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \
175178
if [ -e $(libsqlite3.SO).0.8.6 ]; then \
176179
echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \
177180
rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \

main.mk

+7-3
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,9 @@ all: so
14771477
#
14781478
install-so-1: $(install-dir.lib) $(libsqlite3.SO)
14791479
$(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)"
1480+
@if [ -f $(libsqlite3.SO).a ]; then \
1481+
$(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \
1482+
fi
14801483
@echo "Setting up $(libsqlite3.SO) version symlinks..."; \
14811484
cd "$(install-dir.lib)" || exit $$?; \
14821485
if [ x.dylib = x$(T.dll) ]; then \
@@ -1491,7 +1494,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO)
14911494
mv $(libsqlite3.SO) $(libsqlite3.SO).$(PACKAGE_VERSION) || exit $$?; \
14921495
ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO) || exit $$?; \
14931496
ln -s $(libsqlite3.SO).$(PACKAGE_VERSION) $(libsqlite3.SO).0 || exit $$?; \
1494-
ls -la $(libsqlite3.SO) $(libsqlite3.SO).[03]*; \
1497+
ls -la $(libsqlite3.SO) $(libsqlite3.SO).[a03]*; \
14951498
if [ -e $(libsqlite3.SO).0.8.6 ]; then \
14961499
echo "ACHTUNG: legacy libtool-compatible install found. Re-linking it..."; \
14971500
rm -f libsqlite3.la $(libsqlite3.SO).0.8.6 || exit $$?; \
@@ -1504,6 +1507,7 @@ install-so-1: $(install-dir.lib) $(libsqlite3.SO)
15041507
ls -la $(libsqlite3.SO).0.8.6; \
15051508
fi; \
15061509
fi
1510+
15071511
install-so-0 install-so-:
15081512
install-so: install-so-$(ENABLE_SHARED)
15091513
install: install-so
@@ -2339,7 +2343,7 @@ tidy: tidy-.
23392343
rm -f lemon$(B.exe) sqlite*.tar.gz
23402344
rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe)
23412345
rm -f parse.* fts5parse.*
2342-
rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) libsqlite3$(T.dll).a
2346+
rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) $(libsqlite3.SO).a
23432347
rm -f tclsqlite3$(T.exe) $(TESTPROGS)
23442348
rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe)
23452349
rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe)
@@ -2374,7 +2378,7 @@ distclean: distclean-. clean
23742378

23752379

23762380
# Show important variable settings.
2377-
show-variables:
2381+
show-variables:
23782382
@echo "CC = $(CC)"
23792383
@echo "B.cc = $(B.cc)"
23802384
@echo "T.cc = $(T.cc)"

0 commit comments

Comments
 (0)