X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=Build;h=1abaa6c143eab9824b66bdb60333861898dd7189;hp=74490dd60d5d643c77129402bcd92124826c613a;hb=HEAD;hpb=c8e829c219c65ff8e93b6c7b66212ff0876441c5

diff --git a/Build b/Build
index 74490dd..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,74 +12,72 @@ package "builder"
 		standard CXX "c++11";
 	};
 
-	library "builtintools"
+	library "libbuilder"
 	{
-		source "plugins/builtin";
-		default false;
+		source "source/lib";
+		if_arch "windows"
+		{
+			build_info
+			{
+				library "ole32";
+				library "advapi32";
+				library "shell32";
+			};
+		};
+		install true;
+		install_map
+		{
+			map "source/lib" "include/msp/builder";
+		};
 	};
 
-	library "gnutools"
+	program "builder"
 	{
-		source "plugins/gnu";
-		default false;
+		source "source/cli";
+		use "libbuilder";
+		install true;
 	};
 
-	library "clangtools"
+	module "androidtools"
 	{
-		source "plugins/clang";
-		default false;
+		source "plugins/android";
+		use "libbuilder";
+		install true;
 	};
 
-	library "msvctools"
+	module "basetools"
 	{
-		source "plugins/msvc";
-		default false;
+		source "plugins/base";
+		use "libbuilder";
+		install true;
 	};
 
-	library "androidtools"
+	module "datatools"
 	{
-		source "plugins/android";
-		default false;
+		source "plugins/datafile";
+		use "libbuilder";
+		install true;
 	};
 
-	library "datatools"
+	module "gnutools"
 	{
-		source "plugins/datafile";
-		default false;
+		source "plugins/gnu";
+		use "libbuilder";
+		install true;
 	};
 
-	library "builder"
+	module "clangtools"
 	{
-		source "source/lib";
-		use "builtintools";
-		use "gnutools";
-		use "clangtools";
-		use "msvctools";
-		use "androidtools";
-		use "datatools";
-		build_info
-		{
-			incpath "plugins";
-		};
-		if_arch "windows"
-		{
-			build_info
-			{
-				library "ole32";
-				library "advapi32";
-			};
-		};
+		source "plugins/clang";
+		use "libbuilder";
 		install true;
-		install_map
-		{
-			map "source/lib" "include/msp/builder";
-		};
 	};
 
-	program "builder"
+	module "msvctools"
 	{
-		source "source/cli";
-		use "builder";
+		source "plugins/msvc";
+		use "libbuilder";
+		require "mspcrypto";
 		install true;
 	};