1 files changed, 28 insertions, 10 deletions

diff --git a/build2/bin/target.hxx b/build2/bin/target.hxx
index 329b4a9..f052f22 100644
--- a/build2/bin/target.hxx
+++ b/build2/bin/target.hxx
@@ -16,30 +16,39 @@ namespace build2
   {
     // The obj{} target group.
     //
-    class obje: public file
+    class objx: public file // Common base of all objX{} object files.
     {
     public:
       using file::file;
 
     public:
       static const target_type static_type;
+    };
+
+    class obje: public objx
+    {
+    public:
+      using objx::objx;
+
+    public:
+      static const target_type static_type;
       virtual const target_type& dynamic_type () const {return static_type;}
     };
 
-    class obja: public file
+    class obja: public objx
     {
     public:
-      using file::file;
+      using objx::objx;
 
     public:
       static const target_type static_type;
       virtual const target_type& dynamic_type () const {return static_type;}
     };
 
-    class objs: public file
+    class objs: public objx
     {
     public:
-      using file::file;
+      using objx::objx;
 
     public:
       static const target_type static_type;
@@ -77,30 +86,39 @@ namespace build2
     // organization. So, at least for now, we produce the two at the same time
     // and make obj*{} an ad hoc member of bmi*{}.
     //
-    class bmie: public file
+    class bmix: public file // Common base of all bmiX{} interface files.
     {
     public:
       using file::file;
 
     public:
       static const target_type static_type;
+    };
+
+    class bmie: public bmix
+    {
+    public:
+      using bmix::bmix;
+
+    public:
+      static const target_type static_type;
       virtual const target_type& dynamic_type () const {return static_type;}
     };
 
-    class bmia: public file
+    class bmia: public bmix
     {
     public:
-      using file::file;
+      using bmix::bmix;
 
     public:
       static const target_type static_type;
       virtual const target_type& dynamic_type () const {return static_type;}
     };
 
-    class bmis: public file
+    class bmis: public bmix
     {
     public:
-      using file::file;
+      using bmix::bmix;
 
     public:
       static const target_type static_type;