1 files changed, 11 insertions, 17 deletions
diff --git a/libhello/libhello/buildfile b/libhello/libhello/buildfile
index 505420e..d0cdbe3 100644
--- a/libhello/libhello/buildfile
+++ b/libhello/libhello/buildfile
@@ -1,32 +1,26 @@
-int_libs = # Interface dependencies.
-imp_libs = # Implementation dependencies.
-#import imp_libs += libhello%lib{hello}
+intf_libs = # Interface dependencies.
+impl_libs = # Implementation dependencies.
+#import xxxx_libs += libhello%lib{hello}
 
-lib{hello}: {hxx ixx txx cxx}{** -version} hxx{version} $imp_libs $int_libs
+lib{hello}: {hxx ixx txx cxx}{** -version} hxx{version} $impl_libs $intf_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}: in{version} $src_root/manifest
-{
-  dist  = true
-  clean = ($src_root != $out_root)
-}
+
+hxx{export}@./: cxx.importable = false
 
 # Build options.
 #
 cxx.poptions =+ "-I$out_root" "-I$src_root"
 
-obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
+{hbmia obja}{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
+{hbmis objs}{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
 
 # Export options.
 #
 lib{hello}:
 {
   cxx.export.poptions = "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
+  cxx.export.libs = $intf_libs
 }
 
 liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
@@ -37,9 +31,9 @@ libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
 # for details on the version.* variable values.
 #
 if $version.pre_release
-  lib{hello}: bin.lib.version = @"-$version.project_id"
+  lib{hello}: bin.lib.version = "-$version.project_id"
 else
-  lib{hello}: bin.lib.version = @"-$version.major.$version.minor"
+  lib{hello}: bin.lib.version = "-$version.major.$version.minor"
 
 # Install into the libhello/ subdirectory of, say, /usr/include/
 # recreating subdirectories.