--- quicklook/dataToXML/build.xml	2006/04/25 09:00:20	1.1.1.1
+++ quicklook/dataToXML/build.xml	2006/12/08 09:52:00	1.7
@@ -2,6 +2,10 @@
 <project basedir="." default="compileAll" name="scripts">
     <property environment="env"/>
 
+    <!-- CONFIGURATION FILE. The properties in this file overwrite the previous properties -->
+    	<property file="../../KYoda.properties"/>
+    <!-- CONFIGURATION FILE. The properties in this file overwrite the previous properties -->
+	
     <!-- 
 	CONFIGURATION PARAMETERS
 	Modify here the parameters according to your own system
@@ -22,10 +26,7 @@
 	<property name="scripts.src"
 		  value="${basedir}"/>
 	
-	<!-- CONFIGURATION FILE. The properties in this file overwrite the previous properties -->
-		<property file="../../KYoda.properties"/>
-        <!-- CONFIGURATION FILE. The properties in this file overwrite the previous properties -->
-	
+
 
     <!-- 
 	     PARAMETRIZED PARAMETERS 
@@ -88,16 +89,21 @@
 	<property name="deploy.data"	value="${deploy}/data"/>
     </target>
 
-    <compiler id="scripts-gcc" name="gcc">
+    <compiler id="scripts-gcc" name="g++">
 	    <includepath location="${local.include}"/>
 	    <includepath location="${log4cxx.include}"/>
 	    <includepath location="${root.include}"/>
 	    <compilerarg value="-O"/>
 	    <compilerarg value="-g"/>
     </compiler>
+
+    <compiler id="util-fort" name="g77">
+            <compilerarg value="-c"/>
+            <compilerarg value="-O0"/>
+    </compiler>
     
     <linker id="scripts-link">
-	    <libset dir="${root.lib}"    libs="Cint, Core, Tree, Hist, Gpad, Graf, Matrix"/>
+	    <libset dir="${root.lib}"    libs="Cint, Core, Tree, Hist, Gpad, Graf, Matrix, HistPainter"/>
 	    <libset dir="${log4cxx.lib}" libs="log4cxx"/>
 	    <libset libs="stdc++"/>
     </linker>
@@ -120,9 +126,10 @@
 			    <includepath location="${scripts.src}"/>
 			    <includepath location="${pamSoftware}/include"/>
 			    <includepath location="${pamSoftware}/include/yoda"/>
+			    <includepath location="${pamSoftware}/include/utils"/>
 		    </compiler>
 		    <linker extends="scripts-link">
-			    <libset dir="${pamSoftware}/lib" libs="yoda"/>
+			    <libset dir="${pamSoftware}/lib" libs="yoda, sgp4"/>
 		    </linker>
 	    </cc>
     </target>
@@ -207,7 +214,7 @@
 			    <includepath location="${pamSoftware}/include/yoda"/>
 		    </compiler>
 		    <linker extends="scripts-link">
-			    <libset dir="${pamSoftware}/lib" libs="yoda, utils"/>
+			    <libset dir="${pamSoftware}/lib" libs="yoda, sgp4"/>
 		    </linker>
 	    </cc>
     </target>
@@ -222,14 +229,15 @@
 			    <includepath location="${scripts.src}"/>
 			    <includepath location="${pamSoftware}/include"/>
 			    <includepath location="${pamSoftware}/include/yoda"/>
+			    <includepath location="${pamSoftware}/include/utils"/>
 		    </compiler>
 		    <linker extends="scripts-link">
-			    <libset dir="${pamSoftware}/lib" libs="yoda"/>
+			    <libset dir="${pamSoftware}/lib" libs="yoda, utils"/>
 		    </linker>
 	    </cc>
     </target>
     
-    <target depends="compileArrToXML, compileVarToXML, compileLogToXML, physEndRunToXML, runHeaderToXML, McmdToXML" description="Deploy the scripts" name="deployDataToXML">
+    <target depends="compileArrToXML, compileVarToXML, compileTabToXML, compileLogToXML, physEndRunToXML, runHeaderToXML, McmdToXML" description="Deploy the scripts" name="deployDataToXML">
 	<mkdir dir="${deploy}"/>
 	<mkdir dir="${deploy.lib}"/>
 	<mkdir dir="${deploy.bin}"/>
@@ -238,8 +246,9 @@
 		    <fileset dir="${scripts.bin}" includes="*" excludes="*.*"/>
 	    </copy>
 	    <copy todir="${deploy.data}">
-		    <fileset dir="Data" includes="*/*.*"/>
+		    <fileset dir="Data" includes="**/*.*"/>
 	    </copy>
 	<chmod dir="${deploy.bin}" perm="775" includes="**/*"/>
     </target>
+
 </project>