qt.rb in build-tool-0.5.3

- old
+ new

@@ -1,16 +1,17 @@
+require 'build-tool/build-system/make'
+
 module BuildTool; module BuildSystem
 
 
     #
     #
     #
     class Qt < Base
 
         include MJ::Tools::SubProcess
 
-        class MakeError < BuildTool::Error; end
         class QMakeError < BuildTool::Error; end
 
         def intitialize( *args )
             super( *args )
         end
@@ -55,27 +56,19 @@
             opt += self['flags']
             rc = _configure opt
             rc
         end
 
-        def do_make( target = nil )
-            rc = self.class.execute( "make #{target ? target : "" }", build_directory, self.module.environment.values )
-            if rc != 0
-                raise MakeError, "make #{target || "" } failed with error code #{rc}";
-            end
-            rc
-        end
-
         def install( fast )
             make( "install" )
         end
 
         def install_fast_supported?
             true
         end
 
         def make( target = nil )
-            do_make( target )
+            Make.make( "#{target ? target : "" }", build_directory, self.module.environment.values )
         end
 
         # Configure the module
         def reconfigure()
             if File.exist?( "#{build_directory}/.qmake.cache" )