From bc4c48640ab4e20e944f350b22b61da471f5360d Mon Sep 17 00:00:00 2001
From: Kurtis Heimerl <kurtis.heimerl@rangenetworks.com>
Date: Wed, 14 Nov 2012 03:51:51 +0000
Subject: [PATCH] Alexander's patch #1: This patch makes a step towards using a
 system-wide sqlite3 lib. It moves sqlite3util.cpp/.h to CommonLibs and leaves
 only original sqlite3 files in the sqlite3 dir of OpenBTS.

I do not claim any copyright over this change, as it's very basic.
Looking forward to see it merged into mainline.

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@4467 19bc5d8c-e614-43d4-8b26-e1612bc8e597
---
 CommonLibs/Makefile.am                  | 6 ++++--
 {sqlite3 => CommonLibs}/sqlite3util.cpp | 0
 {sqlite3 => CommonLibs}/sqlite3util.h   | 0
 Makefile.common                         | 2 +-
 sqlite3/Makefile.am                     | 6 ++----
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename {sqlite3 => CommonLibs}/sqlite3util.cpp (100%)
 rename {sqlite3 => CommonLibs}/sqlite3util.h (100%)

diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am
index 52c965c..6bba671 100644
--- a/CommonLibs/Makefile.am
+++ b/CommonLibs/Makefile.am
@@ -33,7 +33,8 @@ libcommon_la_SOURCES = \
 	Timeval.cpp \
 	Logger.cpp \
 	URLEncode.cpp \
-	Configuration.cpp
+	Configuration.cpp \
+	sqlite3util.cpp
 
 noinst_PROGRAMS = \
 	BitVectorTest \
@@ -58,7 +59,8 @@ noinst_HEADERS = \
 	URLEncode.h \
 	Configuration.h \
 	F16.h \
-	Logger.h
+	Logger.h \
+	sqlite3util.h
 
 BitVectorTest_SOURCES = BitVectorTest.cpp
 BitVectorTest_LDADD = libcommon.la
diff --git a/sqlite3/sqlite3util.cpp b/CommonLibs/sqlite3util.cpp
similarity index 100%
rename from sqlite3/sqlite3util.cpp
rename to CommonLibs/sqlite3util.cpp
diff --git a/sqlite3/sqlite3util.h b/CommonLibs/sqlite3util.h
similarity index 100%
rename from sqlite3/sqlite3util.h
rename to CommonLibs/sqlite3util.h
diff --git a/Makefile.common b/Makefile.common
index 9a875dc..593a5f9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -50,6 +50,6 @@ CONTROL_LA = $(top_builddir)/Control/libcontrol.la
 GLOBALS_LA = $(top_builddir)/Globals/libglobals.la
 CLI_LA = $(top_builddir)/CLI/libcli.la
 SR_LA = $(top_builddir)/SR/libSR.la
-SQLITE_LA = $(top_builddir)/sqlite3/libsqlite.la
+SQLITE_LA = $(top_builddir)/sqlite3/libsqlite.la -ldl
 
 MOSTLYCLEANFILES = *~
diff --git a/sqlite3/Makefile.am b/sqlite3/Makefile.am
index 2a2c18e..5a0256c 100644
--- a/sqlite3/Makefile.am
+++ b/sqlite3/Makefile.am
@@ -26,11 +26,9 @@ AM_CXXFLAGS = -Wall -lpthread -ldl
 noinst_LTLIBRARIES = libsqlite.la
 
 libsqlite_la_SOURCES = \
-	sqlite3.c \
-	sqlite3util.cpp
+	sqlite3.c
 
 noinst_HEADERS = \
 	sqlite3.h \
-	sqlite3ext.h \
-	sqlite3util.h
+	sqlite3ext.h