From 88d3b517c08e5a906a224b8b14730f8f80f9ae04 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 31 Aug 2016 11:28:44 +0200
Subject: build2 build system fixes

---
 build/root.build       |  4 +---
 buildfile              |  3 +++
 odb/pgsql/buildfile    | 12 +++++-------
 tests/basics/buildfile |  3 +--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/build/root.build b/build/root.build
index 174f292..fb0de84 100644
--- a/build/root.build
+++ b/build/root.build
@@ -2,8 +2,6 @@
 # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-using cxx
-
 cxx.std = 11
 
-tests/: install = false # Don't install tests.
+using cxx
diff --git a/buildfile b/buildfile
index ac2a27d..e432a77 100644
--- a/buildfile
+++ b/buildfile
@@ -6,4 +6,7 @@ d = odb/pgsql/ tests/
 ./: $d doc{GPLv2 INSTALL LICENSE NEWS README version} file{manifest}
 include $d
 
+# Don't install tests or the INSTALL file.
+#
+dir{tests/}: install = false
 doc{INSTALL}@./: install = false
diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile
index ecc628f..c2a13a5 100644
--- a/odb/pgsql/buildfile
+++ b/odb/pgsql/buildfile
@@ -2,12 +2,8 @@
 # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-# @@ On Debian libpq's headers are in /usr/include/postgresql. There is
-#    pkg-config support.
-#
-
-import libs  = libpq%lib{pq}
-import libs += libodb%lib{odb}
+import int_libs = libodb%lib{odb}
+import imp_libs = libpq%lib{pq}
 
 lib{odb-pgsql}:                                                   \
                {hxx         cxx}{ auto-handle                   } \
@@ -51,7 +47,7 @@ lib{odb-pgsql}:                                                   \
        details/{hxx ixx     cxx}{ options                       } \
 details/build2/{h              }{ config                        } \
 details/build2/{h              }{ config-vc                     } \
-                                  $libs
+                                  $imp_libs $int_libs
 
 cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_PGSQL_BUILD2
 obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD
@@ -61,6 +57,8 @@ lib{odb-pgsql}: cxx.export.poptions = -I$src_root -DLIBODB_PGSQL_BUILD2
 liba{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_STATIC
 libs{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_SHARED
 
+lib{odb-pgsql}: cxx.export.libs = $int_libs
+
 # Load the cli module but only if it's available. This way a distribution that
 # includes pre-generated files can be built without installing cli.
 #
diff --git a/tests/basics/buildfile b/tests/basics/buildfile
index 3be5ecc..24d1759 100644
--- a/tests/basics/buildfile
+++ b/tests/basics/buildfile
@@ -2,7 +2,6 @@
 # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-import libs  = libodb%lib{odb} # @@
-import libs += libodb-pgsql%lib{odb-pgsql}
+import libs = libodb-pgsql%lib{odb-pgsql}
 
 exe{driver}: cxx{driver} $libs
-- 
cgit v1.1