X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=Build;h=da62feed92c10f1c2093f4a63ac9f340c6e3d29a;hb=34c5818e80579cb1c483b5020be0b7d5291aae0b;hp=28ab0e2d40263be12a2f3a4719006010535a6f2a;hpb=6b84e1f5673888753cbe566c1365222ed33fd3ac;p=builder.git

diff --git a/Build b/Build
index 28ab0e2..da62fee 100644
--- a/Build
+++ b/Build
@@ -5,7 +5,6 @@ package "builder"
 
 	require "mspcore";
 	require "mspdatafile";
-	require "mspcrypto";
 	require "sigc++-2.0";
 
 	build_info
@@ -13,18 +12,73 @@ package "builder"
 		standard CXX "c++11";
 	};
 
-	program "builder"
+	library "libbuilder"
 	{
-		source "source";
+		source "source/lib";
 		if_arch "windows"
 		{
 			build_info
 			{
 				library "ole32";
 				library "advapi32";
+				library "shell32";
 			};
 		};
 		install true;
+		install_map
+		{
+			map "source/lib" "include/msp/builder";
+		};
+	};
+
+	program "builder"
+	{
+		source "source/cli";
+		use "libbuilder";
+		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;
 	};
 
 	source_archive