--- yodaUtility/build.xml	2006/04/30 11:08:14	1.1.1.1
+++ yodaUtility/build.xml	2006/09/07 08:40:00	1.3
@@ -2,6 +2,9 @@
 <project basedir="." default="all" name="utils">
     <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
@@ -19,15 +22,13 @@
 	<property name="ant-contrib.lib"
 		  value="/opt/ant-contrib/lib"/>
 	<!-- temporary base directory for compilation -->
-	<property name="compilationFolder"
-		  value="${env.HOME}/tmp/compiler"/>
+	<!--<property name="compilationFolder"
+		  value="${env.HOME}/tmp/compiler"/>-->
 	<!-- yoda source base directory -->
 	<property name="utils.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 -->
+
 	
 	<!-- 
 	     CONFIGURATION PARAMETERS (optional)
@@ -97,6 +98,7 @@
 	<property name="utils.compilationFolder" value="${env.HOME}/tmp/${compilationFolder}"/>
 	<property name="utils.obj"      	 value="${utils.compilationFolder}/obj"/>
 	<property name="utils.lib"      	 value="${utils.compilationFolder}/lib"/>
+	<property name="utils.bin"      	 value="${utils.compilationFolder}/bin"/>
 	
 	<!-- Deploy parameters -->
 	<property name="deploy"   	value="${pamSoftware}"/>
@@ -114,8 +116,13 @@
 	    <compilerarg value="-g"/>
     </compiler>
     
+    <compiler id="util-fort" name="g77">
+	    <compilerarg value="-c"/>
+	    <compilerarg value="-O0"/>
+    </compiler>
+    
     <linker id="utils-link">
-	    <libset dir="${root.lib}"    libs="Cint, Core, Tree"/>
+	    <libset dir="${root.lib}"    libs="Cint, Core, Tree, Graf, Hist, Matrix"/>
 	    <libset dir="${log4cxx.lib}" libs="log4cxx"/>
 	    <libset libs="stdc++"/>
     </linker>
@@ -128,21 +135,32 @@
 	    <mkdir dir="${utils.compilationFolder}"/>
 	    <mkdir dir="${utils.obj}"/>
 	    <mkdir dir="${utils.lib}"/>
+	    <exec dir="${utils.src}" executable="rootcint">
+		    <arg line="-f UtilDict.cpp -c -I..
+			 YMagnGeo.h 
+			 RegistryEvent.h
+			 LinkDef.h"/>
+	    </exec>
 	    <cc objdir="${utils.obj}" outfile="${utils.lib}/utils" outtype="shared">
 		    <compiler extends="utils-gcc">
-			    <fileset dir="${utils.src}" includes="**/*.cpp"/>
+			    <fileset dir="${utils.src}" includes="*.cpp, sgp4/*.cpp"/>
+			    <includepath location="${utils.src}/sgp4"/>
 			    <includepath location="${pamSoftware}/yoda"/>
 			    <includepath location="${utils.src}"/>
 		    </compiler>
+		    <compiler extends="util-fort">
+			    <fileset dir="${utils.src}/igrf" includes="igrf_sub.for, bilcal.for"/>
+		    </compiler>
 		    <linker extends="utils-link"/>
 	    </cc>
     </target>
+
     
     <target depends="compileUtilsLib" description="Deploy the Utils lib" name="deployUtilities">
-	<mkdir dir="${deploy}"/>
-	<mkdir dir="${deploy.lib}"/>
-	<mkdir dir="${deploy.include}"/>
-	<copy todir="${deploy.include}/utils">
+	    <mkdir dir="${deploy}"/>
+	    <mkdir dir="${deploy.lib}"/>
+	    <mkdir dir="${deploy.include}"/>
+	    <copy todir="${deploy.include}/utils">
 		    <fileset dir="${utils.src}" includes="**/*.h"/>
 	    </copy>
 	    <copy todir="${deploy.lib}">
@@ -150,6 +168,16 @@
 	    </copy>
 	    <chmod dir="${deploy.bin}" perm="775" includes="**/*"/>
     </target>
+    
+    <target depends="deployUtilities" description="Deploy the Utils" name="all">
+	    <mkdir dir="${deploy}"/>
+	    <mkdir dir="${deploy.lib}"/>
+	    <mkdir dir="${deploy.include}"/>
+	    <copy todir="${deploy.bin}">
+		    <fileset dir="${utils.bin}" includes="*" excludes="*.*"/>
+	    </copy>
+	    <chmod dir="${deploy.bin}" perm="775" includes="**/*"/>
+    </target>
 </project>