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
This commit is contained in:
Kurtis Heimerl
2012-11-14 03:51:51 +00:00
parent 94c045b1b3
commit bc4c48640a
5 changed files with 7 additions and 7 deletions

View File

@@ -33,7 +33,8 @@ libcommon_la_SOURCES = \
Timeval.cpp \ Timeval.cpp \
Logger.cpp \ Logger.cpp \
URLEncode.cpp \ URLEncode.cpp \
Configuration.cpp Configuration.cpp \
sqlite3util.cpp
noinst_PROGRAMS = \ noinst_PROGRAMS = \
BitVectorTest \ BitVectorTest \
@@ -58,7 +59,8 @@ noinst_HEADERS = \
URLEncode.h \ URLEncode.h \
Configuration.h \ Configuration.h \
F16.h \ F16.h \
Logger.h Logger.h \
sqlite3util.h
BitVectorTest_SOURCES = BitVectorTest.cpp BitVectorTest_SOURCES = BitVectorTest.cpp
BitVectorTest_LDADD = libcommon.la BitVectorTest_LDADD = libcommon.la

View File

@@ -50,6 +50,6 @@ CONTROL_LA = $(top_builddir)/Control/libcontrol.la
GLOBALS_LA = $(top_builddir)/Globals/libglobals.la GLOBALS_LA = $(top_builddir)/Globals/libglobals.la
CLI_LA = $(top_builddir)/CLI/libcli.la CLI_LA = $(top_builddir)/CLI/libcli.la
SR_LA = $(top_builddir)/SR/libSR.la SR_LA = $(top_builddir)/SR/libSR.la
SQLITE_LA = $(top_builddir)/sqlite3/libsqlite.la SQLITE_LA = $(top_builddir)/sqlite3/libsqlite.la -ldl
MOSTLYCLEANFILES = *~ MOSTLYCLEANFILES = *~

View File

@@ -26,11 +26,9 @@ AM_CXXFLAGS = -Wall -lpthread -ldl
noinst_LTLIBRARIES = libsqlite.la noinst_LTLIBRARIES = libsqlite.la
libsqlite_la_SOURCES = \ libsqlite_la_SOURCES = \
sqlite3.c \ sqlite3.c
sqlite3util.cpp
noinst_HEADERS = \ noinst_HEADERS = \
sqlite3.h \ sqlite3.h \
sqlite3ext.h \ sqlite3ext.h
sqlite3util.h