diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-31 11:28:44 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-31 11:28:44 +0200 |
| commit | 88d3b517c08e5a906a224b8b14730f8f80f9ae04 (patch) | |
| tree | 524635acaec72b9cb9f940e89568955af0982437 /odb | |
| parent | 5b4ba1429f07dbfb82b829c92123417a02a4fce2 (diff) | |
build2 build system fixes
Diffstat (limited to 'odb')
| -rw-r--r-- | odb/pgsql/buildfile | 12 |
1 files changed, 5 insertions, 7 deletions
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. # |