From 88e225f1c76a74fbed83e670f394c4ebe886059a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 25 Sep 2015 21:20:54 +0100
Subject: Install rules and use system dbpp

---
 libodbcpp/Jamfile.jam            | 20 +++++++++++++++-----
 libodbcpp/column.h               |  2 +-
 libodbcpp/command.h              |  2 +-
 libodbcpp/connection.h           |  4 ++--
 libodbcpp/error.h                |  2 +-
 libodbcpp/modifycommand.h        |  2 +-
 libodbcpp/selectcommand.h        |  2 +-
 libodbcpp/unittests/Jamfile.jam  |  7 ++++++-
 libodbcpp/unittests/testodbc.cpp |  7 ++++---
 9 files changed, 32 insertions(+), 16 deletions(-)

(limited to 'libodbcpp')

diff --git a/libodbcpp/Jamfile.jam b/libodbcpp/Jamfile.jam
index 9cd4f7f..5ea8c4d 100644
--- a/libodbcpp/Jamfile.jam
+++ b/libodbcpp/Jamfile.jam
@@ -1,22 +1,32 @@
+import package ;
 alias glibmm : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	<linkflags>"`pkg-config --libs glibmm-2.4`"
 	;
 
 lib odbc : : <name>odbc ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
+lib dbppcore : : : : <include>/usr/include/dbpp ;
+lib boost_date_time ;
+lib boost_system ;
 
 lib dbpp-odbc :
 	[ glob *.cpp ] :
-	<library>glibmm 
-	<library>odbc 
-	<library>../libdbpp
+	<library>glibmm
+	<library>odbc
+	<library>adhocutil
+	<library>dbppcore
+	<library>boost_date_time
+	<library>boost_system
 	<cflags>-fvisibility=hidden
 	<variant>release:<cflags>-flto
 	: :
 	<include>.
-	<library>glibmm 
-	<library>../libdbpp
+	<library>glibmm
+	<library>dbppcore
 	;
 
 build-project unittests ;
 
+package.install install : <install-source-root>. : : dbpp-odbc : [ glob *.h ] ;
+
diff --git a/libodbcpp/column.h b/libodbcpp/column.h
index f973577..c39a0f2 100644
--- a/libodbcpp/column.h
+++ b/libodbcpp/column.h
@@ -1,7 +1,7 @@
 #ifndef ODBC_COLUMN_H
 #define ODBC_COLUMN_H
 
-#include "../libdbpp/column.h"
+#include <column.h>
 #include <typeinfo>
 #include <glibmm/ustring.h>
 #include <algorithm>
diff --git a/libodbcpp/command.h b/libodbcpp/command.h
index 17926f6..14b2cbb 100644
--- a/libodbcpp/command.h
+++ b/libodbcpp/command.h
@@ -1,7 +1,7 @@
 #ifndef ODBC_COMMAND_H
 #define ODBC_COMMAND_H
 
-#include "../libdbpp/command.h"
+#include <command.h>
 #include <vector>
 #include "connection.h"
 #include <glibmm/ustring.h>
diff --git a/libodbcpp/connection.h b/libodbcpp/connection.h
index fc4c028..bc05b63 100644
--- a/libodbcpp/connection.h
+++ b/libodbcpp/connection.h
@@ -1,8 +1,8 @@
 #ifndef ODBC_CONNECTION_H
 #define ODBC_CONNECTION_H
 
-#include "../libdbpp/connection.h"
-#include "../libdbpp/error.h"
+#include <connection.h>
+#include <error.h>
 #include "dsn.h"
 #include "error.h"
 #include <sql.h>
diff --git a/libodbcpp/error.h b/libodbcpp/error.h
index f3a2f79..0348980 100644
--- a/libodbcpp/error.h
+++ b/libodbcpp/error.h
@@ -4,7 +4,7 @@
 #include <sql.h>
 #include <stdlib.h>
 #include <exception>
-#include "../libdbpp/error.h"
+#include <error.h>
 
 namespace ODBC {
 	class Error : public DB::Error {
diff --git a/libodbcpp/modifycommand.h b/libodbcpp/modifycommand.h
index df7478a..24fb960 100644
--- a/libodbcpp/modifycommand.h
+++ b/libodbcpp/modifycommand.h
@@ -1,7 +1,7 @@
 #ifndef ODBC_MODIFYCOMMAND_H
 #define ODBC_MODIFYCOMMAND_H
 
-#include "../libdbpp/modifycommand.h"
+#include <modifycommand.h>
 #include "command.h"
 
 namespace ODBC {
diff --git a/libodbcpp/selectcommand.h b/libodbcpp/selectcommand.h
index c728ee1..51dba87 100644
--- a/libodbcpp/selectcommand.h
+++ b/libodbcpp/selectcommand.h
@@ -1,7 +1,7 @@
 #ifndef ODBC_SELECTCOMMAND_H
 #define ODBC_SELECTCOMMAND_H
 
-#include "../libdbpp/selectcommand.h"
+#include <selectcommand.h>
 #include "command.h"
 
 namespace ODBC {
diff --git a/libodbcpp/unittests/Jamfile.jam b/libodbcpp/unittests/Jamfile.jam
index d5b1ec3..1d64f69 100644
--- a/libodbcpp/unittests/Jamfile.jam
+++ b/libodbcpp/unittests/Jamfile.jam
@@ -3,6 +3,9 @@ import testing ;
 path-constant me : . ;
 
 lib boost_utf : : <name>boost_unit_test_framework ;
+lib boost_filesystem ;
+lib boost_system ;
+lib dbpptestcore : : : : <include>/usr/include/dbpp ;
 
 run
 	testodbc.cpp
@@ -10,8 +13,10 @@ run
 	<define>ROOT=\"$(me)\"
 	<define>BOOST_TEST_DYN_LINK
 	<library>..//dbpp-odbc
-	<library>../../libdbpp//dbpptestcore
+	<library>dbpptestcore
 	<library>boost_utf
+	<library>boost_filesystem
+	<library>boost_system
 	:
 	testodbc
 	;
diff --git a/libodbcpp/unittests/testodbc.cpp b/libodbcpp/unittests/testodbc.cpp
index 15e0166..301168c 100644
--- a/libodbcpp/unittests/testodbc.cpp
+++ b/libodbcpp/unittests/testodbc.cpp
@@ -2,9 +2,10 @@
 #include <boost/test/unit_test.hpp>
 
 #include <definedDirs.h>
-#include <modifycommand.h>
-#include <selectcommand.h>
-#include <column.h>
+#include <dbpp/modifycommand.h>
+#include <dbpp/selectcommand.h>
+#include <dbpp/column.h>
+#include <dbpp/error.h>
 #include <mock.h>
 #include <testCore.h>
 #include <definedDirs.h>
-- 
cgit v1.2.3