X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=Build;h=60211baf0d64b655da9ea6f9d36763c50d63367c;hp=c9a35d43dbb5142805486867f18128ef07351fb4;hb=HEAD;hpb=b3988eb3c4dcb52f99596ed53ce94473219a0940

diff --git a/Build b/Build
index c9a35d4..60211ba 100644
--- a/Build
+++ b/Build
@@ -1,37 +1,28 @@
 package "r2c2"
 {
 	require "mspcore";
+	require "mspdatafile";
+	require "mspmath";
 	require "sigc++-2.0";
 
-	program "shoppinglist"
-	{
-		source "source/shoppinglist";
-		build_info
-		{
-			incpath "source";
-			library "r2c2";
-		};
-		require "mspdatafile";
-	};
-
 	library "r2c2"
 	{
 		source "source/libr2c2";
-		require "mspdatafile";
 		// XXX drivers should be made into plugins to avoid this dependency
 		require "mspnet";
 		install true;
 	};
 
+	program "shoppinglist"
+	{
+		source "source/shoppinglist";
+	};
+
 	library "r2c2_3d"
 	{
 		source "source/3d";
 		require "mspgl";
-		build_info
-		{
-			incpath "source";
-			library "r2c2";
-		};
+		use "r2c2";
 		install true;
 	};
 
@@ -39,60 +30,48 @@ package "r2c2"
 	{
 		source "source/network";
 		require "mspnet";
-		build_info
-		{
-			incpath "source";
-			library "r2c2";
-		};
+		use "r2c2";
 		install true;
 	};
 
 	program "designer"
 	{
 		source "source/designer";
-		require "mspstrings";
+		require "mspgui";
+		require "mspgl";
 		require "mspgltk";
-		require "mspgbase";
 		require "libxml++-2.6";
-		build_info
-		{
-			incpath "source";
-			library "r2c2_3d";
-		};
+		use "r2c2";
+		use "r2c2_3d";
 	};
 
 	program "engineer"
 	{
 		source "source/engineer";
-		require "mspstrings";
+		require "mspgui";
+		require "mspgl";
 		require "mspgltk";
-		require "mspgbase";
-		build_info
-		{
-			incpath "source";
-			library "r2c2_3d";
-			library "r2c2_net";
-		};
+		use "r2c2";
+		use "r2c2_3d";
+		use "r2c2_net";
 	};
 
 	program "remote"
 	{
 		source "source/remote";
-		require "gtkmm-2.4";
-		build_info
-		{
-			incpath "source";
-			library "r2c2_net";
-		};
+		require "mspgui";
+		require "mspgl";
+		require "mspgltk";
+		require "mspnet";
+		use "r2c2";
+		use "r2c2_net";
 	};
 
 	program "serial"
 	{
 		source "source/serial";
-		build_info
-		{
-			incpath "source";
-			library "r2c2_net";
-		};
+		require "mspnet";
+		use "r2c2";
+		use "r2c2_net";
 	};
 };