# HG changeset patch
# User iuc
# Date 1414403243 14400
# Node ID ad926bdff38d32566b3b61ad29b6c92a32d53ec0
# Parent  869850cd39db0e915da2ae065f943ebc7af8f62e
Uploaded

diff -r 869850cd39db -r ad926bdff38d tool_dependencies.xml
--- a/tool_dependencies.xml	Thu Oct 09 13:01:24 2014 -0400
+++ b/tool_dependencies.xml	Mon Oct 27 05:47:23 2014 -0400
@@ -1,32 +1,19 @@
-<?xml version="1.0"?>
 <tool_dependency>
-    <package name="libx11" version="1.5.0">
-        <repository changeset_revision="2ecb3f1f8fbb" name="package_libx11_1_5_0" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
-    </package>
-    <package name="libxext-proto" version="7.2.1">
-      <repository changeset_revision="8a06f4f65608" name="package_libxext_proto_7_2_1" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
-    </package>
     <package name="Qt" version="4.8">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz</action>
-                <action type="set_environment_for_install">
-                    <repository changeset_revision="2ecb3f1f8fbb" name="package_libx11_1_5_0" owner="devteam" toolshed="https://toolshed.g2.bx.psu.edu">
-                        <package name="libx11" version="1.5.0" />
-                    </repository>
-                    <package name="package_libxext_proto_7_2_1" owner="devteam">
-                      <repository name="libxext-proto" version="7.2.1" />
-                    </package>
+                <action type="shell_command">./configure -prefix $INSTALL_DIR -opensource -confirm-license -no-xinerama -no-xinput -no-xcursor -no-xvideo -no-opengl -no-sm -no-xkb -no-gui -no-cups -no-openvg -no-xrandr -no-xrender -nomake examples -nomake demos</action>
+                <action type="shell_command">./bin/qmake -r QT_BUILD_PARTS="libs tools"</action>
+                <action type="make_install" />
+                <action type="set_environment">
+                    <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
+                    <environment_variable name="QT_ROOT_DIR" action="set_to">$INSTALL_DIR</environment_variable>
+                    <environment_variable name="LD_LIBRARY_PATH" action="prepend_to">$INSTALL_DIR/lib/</environment_variable>
+                    <environment_variable name="CPLUS_INCLUDE_PATH" action="prepend_to">$INSTALL_DIR/include</environment_variable>
+                    <environment_variable name="C_INCLUDE_PATH" action="prepend_to">$INSTALL_DIR/include</environment_variable>
+                    <environment_variable name="PKG_CONFIG_PATH" action="prepend_to">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                 </action>
-                <action type="shell_command">./configure -prefix $INSTALL_DIR -opensource -confirm-license -no-xinerama -no-xinput -no-xcursor -no-xvideo -no-opengl -no-sm -no-xkb -no-gui -no-cups -no-openvg -no-xrandr -no-xrender</action>
-                <action type="shell_command">make sub-src</action>
-                <action type="shell_command">make install</action>
-                <action type="set_environment">
-                <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                <environment_variable action="append_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
-                <environment_variable action="set_to" name="QT_ROOT_DIR">$INSTALL_DIR</environment_variable>
-                <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib/</environment_variable>
-              </action>
             </actions>
         </install>
         <readme>