Refactor transitive dependencies to work on all targets

[builder.git] / Build

diff --git a/Build b/Build
index 794c3f30167577f157c399bc127d6ad86d74116b..da62feed92c10f1c2093f4a63ac9f340c6e3d29a 100644 (file)
--- a/Build
+++ b/Build
@@ -5,7 +5,6 @@ package "builder"
 
        require "mspcore";
        require "mspdatafile";
-       require "mspcrypto";
        require "sigc++-2.0";
 
        build_info
@@ -13,40 +12,16 @@ package "builder"
                standard CXX "c++11";
        };
 
-       library "builtintools"
-       {
-               source "plugins/builtin";
-               default false;
-       };
-
-       library "androidtools"
-       {
-               source "plugins/android";
-               default false;
-       };
-
-       library "datatools"
-       {
-               source "plugins/datafile";
-               default false;
-       };
-
        library "libbuilder"
        {
                source "source/lib";
-               use "builtintools";
-               use "androidtools";
-               use "datatools";
-               build_info
-               {
-                       incpath "plugins";
-               };
                if_arch "windows"
                {
                        build_info
                        {
                                library "ole32";
                                library "advapi32";
+                               library "shell32";
                        };
                };
                install true;
@@ -63,21 +38,46 @@ package "builder"
                install true;
        };
 
+       module "androidtools"
+       {
+               source "plugins/android";
+               use "libbuilder";
+               install true;
+       };
+
+       module "basetools"
+       {
+               source "plugins/base";
+               use "libbuilder";
+               install true;
+       };
+
+       module "datatools"
+       {
+               source "plugins/datafile";
+               use "libbuilder";
+               install true;
+       };
+
        module "gnutools"
        {
                source "plugins/gnu";
+               use "libbuilder";
                install true;
        };
 
        module "clangtools"
        {
                source "plugins/clang";
+               use "libbuilder";
                install true;
        };
 
        module "msvctools"
        {
                source "plugins/msvc";
+               use "libbuilder";
+               require "mspcrypto";
                install true;
        };