X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=Build;h=4aaaf7617cb8f93dd066ee92a30af2d00680d857;hp=fbced14d1a328d9adf005514935c0489997c9828;hb=d06a1e1ab34e5ecb4bb7011d44298a0b5e6162be;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653

diff --git a/Build b/Build
index fbced14..4aaaf76 100644
--- a/Build
+++ b/Build
@@ -1,35 +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;
 	};
 
@@ -37,60 +30,46 @@ 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 "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";
 	};
 };