X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=4aaaf7617cb8f93dd066ee92a30af2d00680d857;hb=91131237203bffe734219ab8b82b9d17f5d7a87d;hp=9be8021817cb64ba9e1242a9a78a2389f616e908;hpb=2e3ad91af312aaf20b10f1cbe6096cda7e8a97d1;p=r2c2.git

diff --git a/Build b/Build
index 9be8021..4aaaf76 100644
--- a/Build
+++ b/Build
@@ -1,90 +1,75 @@
-package "märklin"
+package "r2c2"
 {
 	require "mspcore";
+	require "mspdatafile";
+	require "mspmath";
 	require "sigc++-2.0";
 
-	program "shoppinglist"
+	library "r2c2"
 	{
-		source "source/shoppinglist";
-		require "mspdatafile";
+		source "source/libr2c2";
+		// XXX drivers should be made into plugins to avoid this dependency
+		require "mspnet";
+		install true;
 	};
 
-	library "marklin"
+	program "shoppinglist"
 	{
-		source "source/libmarklin";
-		require "mspdatafile";
-		install true;
+		source "source/shoppinglist";
 	};
 
-	library "marklin3d"
+	library "r2c2_3d"
 	{
 		source "source/3d";
 		require "mspgl";
-		build_info
-		{
-			incpath "source";
-			library "marklin";
-		};
+		use "r2c2";
 		install true;
 	};
 
-	library "marklinnet"
+	library "r2c2_net"
 	{
 		source "source/network";
 		require "mspnet";
-		build_info
-		{
-			incpath "source";
-			library "marklin";
-		};
+		use "r2c2";
 		install true;
 	};
 
 	program "designer"
 	{
 		source "source/designer";
-		require "mspstrings";
+		require "mspgui";
+		require "mspgl";
 		require "mspgltk";
-		require "mspgbase";
-		build_info
-		{
-			incpath "source";
-			library "marklin3d";
-		};
+		require "libxml++-2.6";
+		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 "marklin3d";
-			library "marklinnet";
-		};
+		use "r2c2";
+		use "r2c2_3d";
+		use "r2c2_net";
 	};
 
 	program "remote"
 	{
 		source "source/remote";
 		require "gtkmm-2.4";
-		build_info
-		{
-			incpath "source";
-			library "marklinnet";
-		};
+		require "mspnet";
+		use "r2c2";
+		use "r2c2_net";
 	};
 
 	program "serial"
 	{
 		source "source/serial";
-		build_info
-		{
-			incpath "source";
-			library "marklinnet";
-		};
+		require "mspnet";
+		use "r2c2";
+		use "r2c2_net";
 	};
 };