X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=Build;h=60211baf0d64b655da9ea6f9d36763c50d63367c;hp=6c6687d2c6d23c1caa6a934261c2d7be67c53f02;hb=refs%2Fheads%2Fmaster;hpb=6ba6af3637c299ab00828c49de9151429488cc17

diff --git a/Build b/Build
index 6c6687d..60211ba 100644
--- a/Build
+++ b/Build
@@ -1,96 +1,77 @@
-package "märklin"
+package "r2c2"
 {
 	require "mspcore";
+	require "mspdatafile";
+	require "mspmath";
 	require "sigc++-2.0";
 
-	program "shoppinglist"
+	library "r2c2"
 	{
-		source "source/shoppinglist";
-		build_info
-		{
-			incpath "source";
-			library "marklin";
-		};
-		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";
 		require "libxml++-2.6";
-		build_info
-		{
-			incpath "source";
-			library "marklin3d";
-		};
+		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 "mspgui";
+		require "mspgl";
+		require "mspgltk";
+		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";
 	};
 };