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