From 4812f0251c47093102fc5e94023baec96aeb0838 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 8 Jan 2013 16:24:59 +0200
Subject: [PATCH] Update Build file

---
 Build | 69 +++++++++++++++++++----------------------------------------
 1 file changed, 22 insertions(+), 47 deletions(-)

diff --git a/Build b/Build
index c9a35d4..30f87b2 100644
--- a/Build
+++ b/Build
@@ -1,37 +1,28 @@
 package "r2c2"
 {
 	require "mspcore";
+	require "mspdatafile";
 	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";
+		use "r2c2";
+	};
+
 	library "r2c2_3d"
 	{
 		source "source/3d";
 		require "mspgl";
-		build_info
-		{
-			incpath "source";
-			library "r2c2";
-		};
+		use "r2c2";
 		install true;
 	};
 
@@ -39,60 +30,44 @@ 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";
-		};
+		use "r2c2";
+		use "r2c2_net";
 	};
 
 	program "serial"
 	{
 		source "source/serial";
-		build_info
-		{
-			incpath "source";
-			library "r2c2_net";
-		};
+		use "r2c2";
+		use "r2c2_net";
 	};
 };
-- 
2.45.2