[MERGED] osmo-trx[master]: Do not embed sqlite3 when building

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Jan 25 19:42:53 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: Do not embed sqlite3 when building
......................................................................


Do not embed sqlite3 when building

Change-Id: If5edadc04c3ff953b451676e55ad3d00d4e43c82
---
M Makefile.am
M Makefile.common
2 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Tom Tsou: Looks good to me, approved
  Harald Welte: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/Makefile.am b/Makefile.am
index 06251f0..f9f5a5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@
 
 # Order must be preserved
 SUBDIRS = \
-	sqlite3 \
 	CommonLibs \
 	GSM \
 	Transceiver52M
diff --git a/Makefile.common b/Makefile.common
index 734ab3a..d7927a5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -33,6 +33,6 @@
 
 COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
 GSM_LA = $(top_builddir)/GSM/libGSM.la
-SQLITE_LA = $(top_builddir)/sqlite3/libsqlite.la -ldl
+SQLITE_LA = -lsqlite3
 
 MOSTLYCLEANFILES = *~

-- 
To view, visit https://gerrit.osmocom.org/1484
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5edadc04c3ff953b451676e55ad3d00d4e43c82
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Ruben Undheim <ruben.undheim at gmail.com>
Gerrit-Reviewer: Tom Tsou <tom at tsou.cc>



More information about the gerrit-log mailing list