From 7d18ad1aaf29efa40ce37f7d901b764f0b37b8c3 Mon Sep 17 00:00:00 2001
From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Mon, 21 Jun 2004 16:02:16 +0000
Subject: [PATCH] Modified to search support files in module project directory

---
 org.glite.lb.client-interface/Makefile  |  8 +--
 org.glite.lb.client-interface/build.xml | 91 ++++++++++++++++++++++++++++++---
 2 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index 0d501a0..6a93c48 100644
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -2,15 +2,15 @@ include Makefile.inc
 
 SUFFIXES = .T
 
-VPATH=${interface}
-AT3=perl -I${lbconfig} ${lbproject}/at3
+VPATH=${top_srcdir}/interface
+AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
 
 STAGETO=${stageinc}/${globalprefix}/${lbprefix}
 STATIC_H=consumer.h context.h dump.h load.h notification.h notifid.h purge.h
 GEN_H=events.h jobstat.h producer.h
 
-all stage: stage-gen stage-static
-compile: generate
+stage: stage-gen stage-static
+all compile: generate
 
 stage-static:
 	-mkdir -p ${STAGETO}
diff --git a/org.glite.lb.client-interface/build.xml b/org.glite.lb.client-interface/build.xml
index 4aa4105..41756bf 100755
--- a/org.glite.lb.client-interface/build.xml
+++ b/org.glite.lb.client-interface/build.xml
@@ -1,36 +1,115 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+	Copyright (c) 2004 on behalf of the EU EGEE Project: 
+	The European Organization for Nuclear Research (CERN), 
+	Istituto Nazionale di Fisica Nucleare (INFN), Italy
+	Datamat Spa, Italy
+	Centre National de la Recherche Scientifique (CNRS), France
+	CS Systeme d'Information (CSSI), France
+	Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
+	Universiteit van Amsterdam (UvA), Netherlands
+	University of Helsinki (UH.HIP), Finland
+	University of Bergen (UiB), Norway
+	Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
 
-<project name="lb" default="dist">
+	Build file for the GLite LB Client Interface module
 	
+	Authors: Ales Krenek <ljocha@ics.muni.cz>
+	Version info: $Id$
+	Release: $Name$
+
+	Revision history:
+	$Log$
+-->
+
+<project name="client-interface" default="compile">
+	
+	<!-- =========================================
+		 Builds the GLite LB Client Interface Module
+		 ========================================= -->
+	
+	<!-- =========================================
+	     Import properties (order is important)
+		 ========================================= -->
+
+	<!-- import baseline & user properties -->
 	<import file="../org.glite/project/baseline.properties.xml" />
+
+	<!-- import component build properties,
+		        component properties &
+		        component common properties -->
 	<import file="./project/properties.xml"/>
+	
+	<!-- import subsystem build properties,
+		        subsystem properties &
+		        subsystem common properties -->
 	<import file="${subsystem.properties.file}"/>
-	<import file="${global.properties.file}" />
 
+	<!-- import global build properties &
+		        global properties -->
+	<import file="${global.properties.file}" />
+		
+	<!-- =========================================
+		 Load dependency property files (order is important)
+		 ========================================= -->
 	<property file="${user.dependencies.file}"/>
 	<property file="${component.dependencies.file}" />
 	<property file="${subsystem.dependencies.file}" />
 	<property file="${global.dependencies.file}"/>
 	
+	<!-- =========================================
+		 Import task definitions (order is important)
+		 ========================================= -->
 	<import file="${subsystem.taskdefs.file}" />
 	<import file="${global.taskdefs.file}" />
+			
+	<!-- =========================================
+		 Load configure options
+		 ========================================= -->
+	<property file="${global.configure.options.file}"/>
 
+	<!-- =========================================
+		 Load common targets
+		 ========================================= -->
 	<import file="${global.targets-external-dependencies.file}"/>	
 	<import file="${global.targets-make.file}" />
-		
-	<property file="${module.version.file}"/>
+	<import file="${component.configure.options.file}"/>
 
+	<!-- =========================================
+		 Load version file 
+		 ========================================= -->
+	<property file="${module.version.file}"/>
+		
+	<!-- ==============================================
+		 Local private targets
+		 ============================================== -->
+	
 	<target name="localinit"
 		description="Module specific initialization tasks">
-		<antcall target="lbmakefiles"/>
+        <!-- Copy support files from the subsystem project to the component project-->
+		<copy toDir="${module.project.dir}">
+			<fileset dir="${subsystem.project.dir}">
+				<include name="at3" />
+				<include name="*.T" />
+				<include name="*.pm" />
+			</fileset>
+		</copy>	
+		<antcall target="lbmakefiles" />
 	</target>
-
+		
 	<target name="localcompile"
 		description="Module specific compile tasks">
 	</target>
 	
 	<target name="localclean"
 		description="Module specific cleaning tasks">
+		<delete>
+			<fileset dir="${module.project.dir}">
+				<include name="at3" />
+				<include name="*.T" />
+				<include name="*.pm" />
+			</fileset>
+		</delete>	
 	</target>
 	
 </project>		
-- 
1.8.2.3