From 6efd6dc40d46f1fa2028a4259c8b2b56f866d6f7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 28 Aug 2019 16:22:34 +0200 Subject: Make lib{build2} "implied interface dependency" of modules This makes our compilation and linking command lines a little bit saner. --- libbuild2/bin/buildfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'libbuild2/bin') diff --git a/libbuild2/bin/buildfile b/libbuild2/bin/buildfile index e490214..d5c6e83 100644 --- a/libbuild2/bin/buildfile +++ b/libbuild2/bin/buildfile @@ -2,13 +2,11 @@ # copyright : Copyright (c) 2014-2019 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import int_libs = libbutl%lib{butl} - include ../ -int_libs += ../lib{build2} +imp_libs = ../lib{build2} # Implied interface dependency. ./: lib{build2-bin}: libul{build2-bin}: {hxx ixx txx cxx}{** -**.test...} \ - $int_libs + $imp_libs # Unit tests. # @@ -34,11 +32,7 @@ objs{*}: cxx.poptions += -DLIBBUILD2_BIN_SHARED_BUILD # Export options. # -lib{build2-bin}: -{ - cxx.export.poptions = "-I$out_root" "-I$src_root" - cxx.export.libs = $int_libs -} +lib{build2-bin}: cxx.export.poptions = "-I$out_root" "-I$src_root" liba{build2-bin}: cxx.export.poptions += -DLIBBUILD2_BIN_STATIC libs{build2-bin}: cxx.export.poptions += -DLIBBUILD2_BIN_SHARED -- cgit v1.1