Replace int_ with intf_ and imp_ with impl_ in names

5 files changed, 16 insertions, 16 deletions

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);