diff options
Diffstat (limited to 'libodb-oracle/odb/oracle/buildfile')
| -rw-r--r-- | libodb-oracle/odb/oracle/buildfile | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/libodb-oracle/odb/oracle/buildfile b/libodb-oracle/odb/oracle/buildfile index c1cb778..8f6716a 100644 --- a/libodb-oracle/odb/oracle/buildfile +++ b/libodb-oracle/odb/oracle/buildfile @@ -13,17 +13,16 @@ if ($cc.target.class != 'windows') else import imp_libs = liboci%lib{oci} -lib{odb-oracle}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ - details/{hxx ixx txx cxx}{* -options} \ - details/build2/{h}{*} \ +lib{odb-oracle}: {hxx ixx txx cxx}{* -version} {hxx}{version} \ + details/{hxx ixx txx cxx}{* -options} \ $imp_libs $int_libs # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -31,7 +30,7 @@ hxx{version-build2}: # Build options. # -cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_ORACLE_BUILD2 +cxx.poptions =+ "-I$out_root" "-I$src_root" obja{*}: cxx.poptions += -DLIBODB_ORACLE_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_ORACLE_SHARED_BUILD @@ -40,7 +39,7 @@ objs{*}: cxx.poptions += -DLIBODB_ORACLE_SHARED_BUILD # lib{odb-oracle}: { - cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_ORACLE_BUILD2 + cxx.export.poptions = "-I$out_root" "-I$src_root" cxx.export.libs = $int_libs } @@ -137,25 +136,3 @@ install_include = [dir_path] include/odb/oracle/ install = $install_include install.subdirs = true } - -# We want these to be picked up whether LIBODB_ORACLE_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - -details/build2/ -{ - h{*}: install = false - - if ($cxx.target.system == 'win32-msvc') - { - h{config-vc}@./: install = $install_include/details/ - h{config-vc-stub}@./: install = $install_include/details/build2/config-vc.h - } - else - { - h{config}@./: install = $install_include/details/ - h{config-stub}@./: install = $install_include/details/build2/config.h - } -} |