cleanup dependences in the old build

diff --git a/org.glite.jp/build.xml b/org.glite.jp/build.xml
index 925b449..5e78b58 100644 (file)
--- a/org.glite.jp/build.xml
+++ b/org.glite.jp/build.xml
@@ -12,6 +12,10 @@
 
        Revision history:
        $Log$
+       Revision 1.11  2006/01/16 17:20:25  mmulac
+       merge from RC15 branch
+        - compiles
+       
        Revision 1.10.2.1  2005/10/20 06:55:15  zsalvet
        Add libtar and mysql external dependencies.
        
@@ -248,6 +252,42 @@
                </if>
        </target>
 
+       <target name="lb.common" unless="setenvonly" depends="envset">
+               <if>
+                       <isset property="small.memory"/>
+                       <then>
+                               <exec dir="${lb.subsystem.dir}" executable="${antExec}" failonerror="${failonerror}">
+                                       <arg line="common -Dtarget=${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
+                               </exec>
+                       </then>
+                       <else>
+                               <ant dir="${lb.subsystem.dir}"
+                                       target="common"
+                                       inheritall="false" >
+                                       <property name="target" value="${target}"/>
+                               </ant>
+                       </else>
+               </if>
+       </target>
+
+       <target name="lb.client-interface" unless="setenvonly" depends="envset">
+               <if>
+                       <isset property="small.memory"/>
+                       <then>
+                               <exec dir="${lb.subsystem.dir}" executable="${antExec}" failonerror="${failonerror}">
+                                       <arg line="client-interface -Dtarget=${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
+                               </exec>
+                       </then>
+                       <else>
+                               <ant dir="${lb.subsystem.dir}"
+                                       target="client-interface"
+                                       inheritall="false" >
+                                       <property name="target" value="${target}"/>
+                               </ant>
+                       </else>
+               </if>
+       </target>
+
        <target name="ws-interface" unless="setenvonly" depends="envset" >
                <if>
                        <isset property="small.memory" />
@@ -264,7 +304,7 @@
                </if>
        </target>
 
-       <target name="common" unless="setenvonly" depends="envset" >
+       <target name="common" unless="setenvonly" depends="envset,lb.client-interface" >
                <if>
                        <isset property="small.memory" />
                        <then>
@@ -312,7 +352,7 @@
                </if>
        </target>
 
-       <target name="server-common" unless="setenvonly" depends="envset, mysql, common" >
+       <target name="server-common" unless="setenvonly" depends="envset, mysql, common,lb.common" >
                <if>
                        <isset property="small.memory" />
                        <then>