Replace int_ with intf_ and imp_ with impl_ in names

15 files changed, 45 insertions, 45 deletions

diff --git a/libbuild2/adhoc-rule-cxx.cxx b/libbuild2/adhoc-rule-cxx.cxx
index 92af269..ece687f 100644
--- a/libbuild2/adhoc-rule-cxx.cxx
+++ b/libbuild2/adhoc-rule-cxx.cxx
@@ -487,8 +487,8 @@ namespace build2
 
         ofs.open (of);
 
-        ofs << "import imp_libs += build2%lib{build2}"                  << '\n'
-            << "libs{" << id << "}: cxx{rule} hxx{location} $imp_libs"  << '\n'
+        ofs << "import impl_libs += build2%lib{build2}"                 << '\n'
+            << "libs{" << id << "}: cxx{rule} hxx{location} $impl_libs" << '\n'
             << '\n'
             << "if ($cxx.target.system == 'win32-msvc')"                << '\n'
             << "  cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS" << '\n'
diff --git a/libbuild2/bash/buildfile b/libbuild2/bash/buildfile
index 2fd49ec..e335321 100644
--- a/libbuild2/bash/buildfile
+++ b/libbuild2/bash/buildfile
@@ -4,13 +4,13 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
 include ../in/
-int_libs = ../in/lib{build2-in}
+intf_libs = ../in/lib{build2-in}
 
 ./: lib{build2-bash}: libul{build2-bash}: {hxx ixx txx cxx}{** -**.test...} \
-  $int_libs $imp_libs
+  $intf_libs $impl_libs
 
 # Unit tests.
 #
@@ -39,7 +39,7 @@ objs{*}: cxx.poptions += -DLIBBUILD2_BASH_SHARED_BUILD
 lib{build2-bash}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 liba{build2-bash}: cxx.export.poptions += -DLIBBUILD2_BASH_STATIC
diff --git a/libbuild2/bin/buildfile b/libbuild2/bin/buildfile
index 0df78e6..f17fa8a 100644
--- a/libbuild2/bin/buildfile
+++ b/libbuild2/bin/buildfile
@@ -4,10 +4,10 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
 ./: lib{build2-bin}: libul{build2-bin}: {hxx ixx txx cxx}{** -**.test...} \
-  $imp_libs
+  $impl_libs
 
 # Unit tests.
 #
diff --git a/libbuild2/buildfile b/libbuild2/buildfile
index 96fcfd2..17003b5 100644
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -23,7 +23,7 @@ include $bundled_modules
 
 # NOTE: shared imports should go into root.build.
 #
-int_libs = $libbutl
+intf_libs = $libbutl
 
 lib{build2}: libul{build2}:                                            \
   {hxx ixx txx cxx}{* -utility-*installed -config -version -*.test...} \
@@ -92,7 +92,7 @@ libul{build2}: install/{hxx ixx txx cxx}{** -**.test...}
 
 libul{build2}: test/{hxx ixx txx cxx}{** -**.test...}
 
-libul{build2}: $int_libs
+libul{build2}: $intf_libs
 
 # Include the generated config and version headers into the distribution (so
 # that we don't pick up installed ones) and don't remove them when cleaning in
@@ -193,7 +193,7 @@ else
 lib{build2}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 # While we don't call any pthread_*() functions in our API, this appears to be
diff --git a/libbuild2/c/buildfile b/libbuild2/c/buildfile
index fa23648..2225112 100644
--- a/libbuild2/c/buildfile
+++ b/libbuild2/c/buildfile
@@ -4,13 +4,13 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
 include ../cc/
-int_libs = ../cc/lib{build2-cc}
+intf_libs = ../cc/lib{build2-cc}
 
 ./: lib{build2-c}: libul{build2-c}: {hxx ixx txx cxx}{** -**.test...} \
-  $int_libs $imp_libs
+  $intf_libs $impl_libs
 
 # Unit tests.
 #
@@ -52,7 +52,7 @@ if! $cross
 lib{build2-c}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 liba{build2-c}: cxx.export.poptions += -DLIBBUILD2_C_STATIC
diff --git a/libbuild2/c/init.cxx b/libbuild2/c/init.cxx
index 1636816..1849622 100644
--- a/libbuild2/c/init.cxx
+++ b/libbuild2/c/init.cxx
@@ -204,13 +204,13 @@ namespace build2
         vp.insert<strings>      ("c.export.coptions"),
         vp.insert<strings>      ("c.export.loptions"),
         vp.insert<vector<name>> ("c.export.libs"),
-        vp.insert<vector<name>> ("c.export.imp_libs"),
+        vp.insert<vector<name>> ("c.export.impl_libs"),
 
         vp["cc.export.poptions"],
         vp["cc.export.coptions"],
         vp["cc.export.loptions"],
         vp["cc.export.libs"],
-        vp["cc.export.imp_libs"],
+        vp["cc.export.impl_libs"],
 
         vp.insert_alias (vp["cc.stdlib"], "c.stdlib"), // Same as cc.stdlib.
 
diff --git a/libbuild2/cc/buildfile b/libbuild2/cc/buildfile
index fc8809d..e98e3de 100644
--- a/libbuild2/cc/buildfile
+++ b/libbuild2/cc/buildfile
@@ -4,16 +4,16 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
-import imp_libs += libpkgconf%lib{pkgconf}
+import impl_libs += libpkgconf%lib{pkgconf}
 
 include ../bin/
-int_libs = ../bin/lib{build2-bin}
+intf_libs = ../bin/lib{build2-bin}
 
 ./: lib{build2-cc}: libul{build2-cc}: {hxx ixx txx cxx}{** -**.test...} \
   h{msvc-setup}                                                         \
-  $int_libs $imp_libs
+  $intf_libs $impl_libs
 
 # Unit tests.
 #
@@ -50,7 +50,7 @@ if ($cxx.target.class == 'windows')
 lib{build2-cc}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 liba{build2-cc}: cxx.export.poptions += -DLIBBUILD2_CC_STATIC
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index dabc007..245109b 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -24,7 +24,7 @@ namespace build2
     // Recursively process prerequisite libraries of the specified library. If
     // proc_impl returns false, then only process interface (*.export.libs),
     // otherwise -- interface and implementation (prerequisite and from
-    // *.libs, unless overriden with *.export.imp_libs).
+    // *.libs, unless overriden with *.export.impl_libs).
     //
     // Note that here we assume that an interface library is also always an
     // implementation (since we don't use *.export.libs for static linking).
@@ -123,7 +123,7 @@ namespace build2
         // Note that we used to treat *.export.libs set on the liba/libs{}
         // members as *.libs overrides rather than as member-specific
         // interface dependencies. This difference in semantics proved to be
-        // surprising so now we have separate *.export.imp_libs for that.
+        // surprising so now we have separate *.export.impl_libs for that.
         // Note that in this case options come from *.export.* variables.
         //
         // Note also that we only check for *.*libs. If one doesn't have any
@@ -131,12 +131,12 @@ namespace build2
         // set to NULL or empty (this is why we check for the result being
         // defined).
         //
-        c_e_libs = l[impl ? c_export_imp_libs : c_export_libs];
+        c_e_libs = l[impl ? c_export_impl_libs : c_export_libs];
 
         if (!cc)
           x_e_libs = l[same
-                       ? (impl ? x_export_imp_libs : x_export_libs)
-                       : vp[*t + (impl ? ".export.imp_libs" : ".export.libs")]];
+                       ? (impl ? x_export_impl_libs : x_export_libs)
+                       : vp[*t + (impl ? ".export.impl_libs" : ".export.libs")]];
 
         // Process options first.
         //
@@ -258,7 +258,7 @@ namespace build2
 
       // Only go into prerequisites (implementation) if instructed and we are
       // not using explicit export. Otherwise, interface dependencies come
-      // from the lib{}:*.export.imp_libs below.
+      // from the lib{}:*.export.impl_libs below.
       //
       if (impl && !c_e_libs.defined () && !x_e_libs.defined ())
       {
@@ -456,7 +456,7 @@ namespace build2
                 if (w != nullptr)
                   fail   << (impl ? "implementation" : "interface")
                          << " dependency " << t << " is " << w <<
-                    info << "mentioned in *.export." << (impl ? "imp_" : "")
+                    info << "mentioned in *.export." << (impl ? "impl_" : "")
                          << "libs of target " << l <<
                     info << "is it a prerequisite of " << l << "?";
               }
diff --git a/libbuild2/cc/common.hxx b/libbuild2/cc/common.hxx
index 77819db..747395b 100644
--- a/libbuild2/cc/common.hxx
+++ b/libbuild2/cc/common.hxx
@@ -91,13 +91,13 @@ namespace build2
       const variable& x_export_coptions;
       const variable& x_export_loptions;
       const variable& x_export_libs;
-      const variable& x_export_imp_libs;
+      const variable& x_export_impl_libs;
 
       const variable& c_export_poptions; // cc.export.*
       const variable& c_export_coptions;
       const variable& c_export_loptions;
       const variable& c_export_libs;
-      const variable& c_export_imp_libs;
+      const variable& c_export_impl_libs;
 
       const variable& x_stdlib;       // x.stdlib
 
diff --git a/libbuild2/cc/init.cxx b/libbuild2/cc/init.cxx
index e8b0e6f..eae6d6d 100644
--- a/libbuild2/cc/init.cxx
+++ b/libbuild2/cc/init.cxx
@@ -108,7 +108,7 @@ namespace build2
       vp.insert<strings>      ("cc.export.coptions");
       vp.insert<strings>      ("cc.export.loptions");
       vp.insert<vector<name>> ("cc.export.libs");
-      vp.insert<vector<name>> ("cc.export.imp_libs");
+      vp.insert<vector<name>> ("cc.export.impl_libs");
 
       // Hint variables (not overridable).
       //
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index 671a51a..a70e9a2 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -1096,7 +1096,7 @@ namespace build2
         // Set even if empty (export override).
         //
         {
-          auto p (t.vars.insert (la ? c_export_imp_libs : c_export_libs));
+          auto p (t.vars.insert (la ? c_export_impl_libs : c_export_libs));
 
           if (p.second)
             p.first = move (libs);
diff --git a/libbuild2/cxx/buildfile b/libbuild2/cxx/buildfile
index a95da97..5862bec 100644
--- a/libbuild2/cxx/buildfile
+++ b/libbuild2/cxx/buildfile
@@ -4,13 +4,13 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
 include ../cc/
-int_libs = ../cc/lib{build2-cc}
+intf_libs = ../cc/lib{build2-cc}
 
 ./: lib{build2-cxx}: libul{build2-cxx}: {hxx ixx txx cxx}{** -**.test...} \
-  $int_libs $imp_libs
+  $intf_libs $impl_libs
 
 # Unit tests.
 #
@@ -52,7 +52,7 @@ if! $cross
 lib{build2-cxx}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 liba{build2-cxx}: cxx.export.poptions += -DLIBBUILD2_CXX_STATIC
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx
index 74dc3ed..2c5c919 100644
--- a/libbuild2/cxx/init.cxx
+++ b/libbuild2/cxx/init.cxx
@@ -547,13 +547,13 @@ namespace build2
         vp.insert<strings>      ("cxx.export.coptions"),
         vp.insert<strings>      ("cxx.export.loptions"),
         vp.insert<vector<name>> ("cxx.export.libs"),
-        vp.insert<vector<name>> ("cxx.export.imp_libs"),
+        vp.insert<vector<name>> ("cxx.export.impl_libs"),
 
         vp["cc.export.poptions"],
         vp["cc.export.coptions"],
         vp["cc.export.loptions"],
         vp["cc.export.libs"],
-        vp["cc.export.imp_libs"],
+        vp["cc.export.impl_libs"],
 
         vp.insert<string> ("cxx.stdlib"),
 
diff --git a/libbuild2/in/buildfile b/libbuild2/in/buildfile
index f396e31..5f51bdb 100644
--- a/libbuild2/in/buildfile
+++ b/libbuild2/in/buildfile
@@ -4,10 +4,10 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
 ./: lib{build2-in}: libul{build2-in}: {hxx ixx txx cxx}{** -**.test...} \
-  $imp_libs
+  $impl_libs
 
 # Unit tests.
 #
diff --git a/libbuild2/version/buildfile b/libbuild2/version/buildfile
index b991f73..4808ded 100644
--- a/libbuild2/version/buildfile
+++ b/libbuild2/version/buildfile
@@ -4,14 +4,14 @@
 # NOTE: shared imports should go into root.build.
 #
 include ../
-imp_libs = ../lib{build2} # Implied interface dependency.
+impl_libs = ../lib{build2} # Implied interface dependency.
 
 include ../in/
-int_libs = ../in/lib{build2-in}
+intf_libs = ../in/lib{build2-in}
 
 ./: lib{build2-version}: libul{build2-version}: \
   {hxx ixx txx cxx}{** -**.test...}             \
-  $int_libs $imp_libs
+  $intf_libs $impl_libs
 
 # Unit tests.
 #
@@ -40,7 +40,7 @@ objs{*}: cxx.poptions += -DLIBBUILD2_VERSION_SHARED_BUILD
 lib{build2-version}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 liba{build2-version}: cxx.export.poptions += -DLIBBUILD2_VERSION_STATIC