From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 17 Mar 2011 16:14:52 +0000 (+0000)
Subject: Relocatable build directory.
X-Git-Tag: glite-lbjp-common-db_R_3_0_2_1~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c67157617daa0d4db9ce039794a312eebfe205a6;p=jra1mw.git

Relocatable build directory.
---

diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile
index 85942a8..f1de15c 100644
--- a/org.glite.jobid.api-c/Makefile
+++ b/org.glite.jobid.api-c/Makefile
@@ -10,12 +10,11 @@ CC:=gcc
 CXX:=g++
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test
-CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=0 perl ${top_srcdir}/project/check_version.pl
 
 DEBUG:=-g -O0 -Wall
 
@@ -69,7 +68,10 @@ base64_test: %: %.cpp compile
 clean:
 	rm -rvf *.o *.lo .libs/ lib* *.c *.cpp *.h
 	rm -vf base64_test base64_test.xml
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+stage:
+	$(MAKE) install PREFIX=${stagedir}
 
 install: ${LIB}
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
@@ -82,4 +84,4 @@ install: ${LIB}
 	${COMPILE} -o $@ -c $< 
 
 
-.PHONY: default all compile check install clean
+.PHONY: default all compile check stage install clean
diff --git a/org.glite.jobid.api-cpp/Makefile b/org.glite.jobid.api-cpp/Makefile
index 3792efa..577aa76 100644
--- a/org.glite.jobid.api-cpp/Makefile
+++ b/org.glite.jobid.api-cpp/Makefile
@@ -43,7 +43,7 @@ check: compile
 
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 install: 
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix}
diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile
index bb989a7..77bde52 100644
--- a/org.glite.jobid.api-java/Makefile
+++ b/org.glite.jobid.api-java/Makefile
@@ -1,7 +1,15 @@
+top_srcdir=.
+stagedir=../stage
+
 -include Makefile.inc
 
+ANT_ARGS=-f ${top_srcdir}/build.xml -Dfile.reference.commons-codec.jar=${jakarta-commons-codec_jar} -Dsrc.dir=${top_srcdir}/src -Dbuild.dir=$(shell pwd)/build -Ddist.dir=$(shell pwd)/dist
+
 all compile:
-	${ant_prefix}/bin/ant -Dfile.reference.commons-codec.jar=${jakarta-commons-codec_jar}
+	${ant_prefix}/bin/ant ${ANT_ARGS}
+
+stage:
+	$(MAKE) install PREFIX=${stagedir}
 
 install:
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java
@@ -10,5 +18,7 @@ install:
 check:
 
 clean:
-	${ant_prefix}/bin/ant clean
-	rm -rvf log.xml project/glite-jobid-api-java.spec rpmbuild/ RPMS/ tgz/ debian/
+	${ant_prefix}/bin/ant ${ANT_ARGS} clean
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+.PHONY: all compile stage install check clean
diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 4c48613..6fca0ec 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -1,19 +1,22 @@
+top_srcdir=.
+stagedir=../stage
+
 -include Makefile.inc
 
 # broken 
 # SimpleLLTest.class ProducerTestLL.class ProducerTestIL.class
 
-FULL_EXAMPLES := $(addprefix examples/,SSLClient.java SSLServer.java QueryDemo.java NotificationExample.java CreamTest.java)
-SSL_EXAMPLES := $(addprefix examples/simple-ssl/,MyX509KeyManager.java MyX509TrustManager.java ExampleSSLSocketFactory.java LBClientSSL.java)
-TM_EXAMPLES := $(addprefix examples/simple-trustmanager/,LBClientTM.java)
+FULL_EXAMPLES := $(addprefix ${top_srcdir}/examples/,SSLClient.java SSLServer.java QueryDemo.java NotificationExample.java CreamTest.java)
+SSL_EXAMPLES := $(addprefix ${top_srcdir}/examples/simple-ssl/,MyX509KeyManager.java MyX509TrustManager.java ExampleSSLSocketFactory.java LBClientSSL.java)
+TM_EXAMPLES := $(addprefix ${top_srcdir}/examples/simple-trustmanager/,LBClientTM.java)
 
-VPATH := examples examples/simple-ssl examples/simple-trustmanager
+VPATH := ${top_srcdir}/examples ${top_srcdir}/examples/simple-ssl ${top_srcdir}/examples/simple-trustmanager
 
 JAVAC:=${jdk_prefix}/bin/javac
 JAVAH:=${jdk_prefix}/bin/javah
 JAVA:=${jdk_prefix}/bin/java
 
-GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 project/genEventTypes.pl
+GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
 AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3
 axis_classpath:=$(shell ls -1 ${axis_prefix}/lib/*.jar 2>/dev/null | tr '\012' :)
 trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :)
@@ -24,7 +27,7 @@ compile-java:
 	${JAVAC} \
 		-classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \
 		-d build \
-		src/org/glite/lb/*.java \
+		${top_srcdir}/src/org/glite/lb/*.java \
 		build/gen/*.java \
 		build/axis/org/glite/wsdl/services/lb/*.java \
 		build/axis/org/glite/wsdl/services/lb4agu/*.java \
@@ -42,6 +45,7 @@ lb-client-java.jar:
 build-c:
 	${JAVAH} -classpath build -jni -d build org.glite.lb.ContextIL
 	-mkdir -p build/c
+	-ln -s ${top_srcdir}/src_c .
 	-ln -s ../../src_c/Makefile build/c
 	cd build/c && $(MAKE) PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=../..
 
@@ -71,6 +75,9 @@ build/axis:
 check:
 	@echo "No check"
 
+stage:
+	$(MAKE) install PREFIX=${stagedir}
+
 install:
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java
 	cp build/lb-client-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java
@@ -79,7 +86,6 @@ install:
 
 clean:
 	rm -rf build
-	cd src_c && $(MAKE) clean
-	rm -rvf log.xml project/org.glite.lb.client-java.spec rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
-.PHONY: all compile compile-java build-jar build-c examples genevents genws check install clean
+.PHONY: all compile compile-java build-jar build-c examples genevents genws check stage install clean
diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile
index 2164409..8a00142 100755
--- a/org.glite.lb.client-java/src_c/Makefile
+++ b/org.glite.lb.client-java/src_c/Makefile
@@ -1,4 +1,3 @@
--include ../Makefile.inc
 -include ../../Makefile.inc
 
 CC=gcc
diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 47704d5..391f84c 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -10,7 +10,7 @@ CC:=gcc
 CXX:=g++
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -325,7 +325,12 @@ man: ${MAN_GZ} ${MAN8_GZ}
 stage:  compile
 	$(MAKE) install PREFIX=${stagedir} staging=1
 
-Event.h Event.cpp: EventAttrNames.pl
+link:
+	-ln -s ${top_srcdir}/src/EventAttrNames.pl .
+	-ln -s ${top_srcdir}/src/StatusAttrNames.pl .
+	-ln -s ${top_srcdir}/src/uiwrap.T .
+
+Event.h Event.cpp: link
 
 JobStatus.h JobStatus.cpp: StatusAttrNames.pl
 
@@ -387,11 +392,11 @@ clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/
 	rm -rvf ${lib_LTLIBRARIES} ${TOOLS} logevent  register_sandbox ${MAN_GZ} ${MAN8_GZ}
 	rm -rvf ${EXAMPLES} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS}
-	rm -f EventAttrNames.pl
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -f EventAttrNames.pl StatusAttrNames.pl uiwrap.T
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 check_version:
 	${CHECK_VERSION} ${stagedir}${prefix}/include/glite/lb/common_version.h
 
 
-.PHONY: default all compile examples check stage install clean check_version
+.PHONY: default all compile examples check stage install clean check_version link
diff --git a/org.glite.lb.client/interface/Event.h.T b/org.glite.lb.client/interface/Event.h.T
index 9832182..1a198b6 100644
--- a/org.glite.lb.client/interface/Event.h.T
+++ b/org.glite.lb.client/interface/Event.h.T
@@ -86,7 +86,7 @@ public:
 	enum Attr {
 @@@{
 
-	require "../src/EventAttrNames.pl";
+	require "./EventAttrNames.pl";
 	my %EventAttrNums;
 	my $evno = 0;
 	for (@main::EventAttrNames) {
diff --git a/org.glite.lb.client/interface/JobStatus.h.T b/org.glite.lb.client/interface/JobStatus.h.T
index afe1d4e..20cbcf3 100644
--- a/org.glite.lb.client/interface/JobStatus.h.T
+++ b/org.glite.lb.client/interface/JobStatus.h.T
@@ -76,7 +76,7 @@ public:
 	 */
 	enum Attr {
 @@@{
-	require '../src/StatusAttrNames.pl';
+	require './StatusAttrNames.pl';
 	my %StatusAttrNums;
 	my $stno = 0;
 	for (@main::StatusAttrNames) {
diff --git a/org.glite.lb.client/interface/producer.h.T b/org.glite.lb.client/interface/producer.h.T
index 91177aa..c3c9be9 100644
--- a/org.glite.lb.client/interface/producer.h.T
+++ b/org.glite.lb.client/interface/producer.h.T
@@ -58,7 +58,7 @@ extern "C" {
 $PRINTPROTOTYPESONLY = 1;
 $PRINTDOC = 1;
 
-require '../src/uiwrap.T';
+require './uiwrap.T';
 
 @@@}
 
diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T
index a5bfad9..e3f829c 100644
--- a/org.glite.lb.client/src/Event.cpp.T
+++ b/org.glite.lb.client/src/Event.cpp.T
@@ -41,7 +41,7 @@ EWL_BEGIN_NAMESPACE;
 
 @@@{
 
-require '../src/EventAttrNames.pl';
+require './EventAttrNames.pl';
 
 sub typeswitch {
 	my $ftype = shift;
diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T
index 3f1ed7b..b853ceb 100644
--- a/org.glite.lb.client/src/JobStatus.cpp.T
+++ b/org.glite.lb.client/src/JobStatus.cpp.T
@@ -34,7 +34,7 @@ EWL_BEGIN_NAMESPACE;
 
 @@@{
 
-require '../src/StatusAttrNames.pl';
+require './StatusAttrNames.pl';
 
 sub typeswitch {
         my ($ftype,$ctype,$resc) = @_;
diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T
index db32145..caf0414 100644
--- a/org.glite.lb.client/src/uiwrap.c.T
+++ b/org.glite.lb.client/src/uiwrap.c.T
@@ -30,6 +30,6 @@ limitations under the License.
 $PRINTPROTOTYPESONLY = 0;
 $PRINTDOC = 0;
 
-require '../src/uiwrap.T';
+require './uiwrap.T';
 
 @@@}
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index f0dff5f..281f142 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -12,7 +12,7 @@ prefix=
 expat_prefix=/opt/expat
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 jobiddir=${top_srcdir}/../org.glite.jobid.api-c
 
@@ -126,7 +126,7 @@ default: all
 
 generate: ${GEN_HDRS}
 
-common_version.h: ${top_srcdir}/project/version.properties
+common_version.h: ${top_srcdi${top_srcdir}/project/version.properties
 	echo "#define GLITE_LB_COMMON_VERSION \"${version}\"" >$@
 
 all compile: generate ${lib_LTLIBRARIES} ${lib_LIBRARIES}
@@ -239,7 +239,7 @@ install:
 
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ test_parse il_test parse.cpp events.tex status.tex
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.o: %.c
 	${COMPILE} ${CFLAGS} -c $<
diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile
index 4b5d965..ab5e1ec 100644
--- a/org.glite.lb.doc/Makefile
+++ b/org.glite.lb.doc/Makefile
@@ -9,7 +9,7 @@ PREFIX=/opt/glite
 prefix=
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -77,7 +77,7 @@ install:
 
 clean:
 	rm -rvf LBUG* LBAG* LBDG* LBTP* events.tex status.tex ver.tex comment*
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 
 # dependencies:
diff --git a/org.glite.lb.glite-LB/Makefile b/org.glite.lb.glite-LB/Makefile
index 8b553a1..13a1e41 100644
--- a/org.glite.lb.glite-LB/Makefile
+++ b/org.glite.lb.glite-LB/Makefile
@@ -6,7 +6,7 @@ PREFIX=/opt/glite
 prefix=
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 default all:
 
@@ -18,6 +18,6 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 .PHONY: default all check install stage clean
diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index b86441a..0bf9435 100644
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -84,7 +84,7 @@ install: compile
 clean:
 	rm -rfv *.o *.lo *.loT .libs/ manpage.links manpage.refs
 	rm -rvf harvester harvester-dbg glite-lb-harvester.* startup
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 harvester: harvester.o
 	${LINK} -o $@ $+ ${LIBS}
diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index cd84de6..d862716 100644
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -11,7 +11,7 @@ nothrflavour=gcc32
 thrflavour=gcc32pthr
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -105,4 +105,4 @@ install:
 
 clean:
 	rm -rvf .libs/ *.o *.lo ${PLUGIN_LIB} ${MAN_GZ}
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/
diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 64d0b1e..b9c7c4b 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -10,7 +10,7 @@ prefix=
 sysconfdir=/opt/glite/etc
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -244,4 +244,4 @@ il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest
 
 clean:
 	rm -rvf .libs/ *.o *.lo *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ} startup
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 91432b8..4c6174a 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -20,7 +20,7 @@ lcas_prefix=/opt/glite
 gridsite_prefix=/opt/glite
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -245,6 +245,8 @@ LCAS_PLUGIN_LIB:=liblcas_lb.la
 
 EXAMPLES=
 
+TESTS=test_coverage test_xml test_query_events test_soap_conv
+
 glite-lb-bkserverd: ${NSMAP} ${BKSERVER_OBJS}
 	${LINKXX} -o $@ ${BKSERVER_OBJS} ${BKSERVER_LIBS} -Wl,--export-dynamic
 
@@ -374,8 +376,8 @@ ifdef LB_PERF
 endif
 
 clean:
-	rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} test* ${MAN_GZ} ${EXAMPLES} startup
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} ${TESTS} ${MAN_GZ} ${EXAMPLES} startup
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.c: %.c.T
 	rm -f $@
diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 7d8f6f7..20c3aec 100644
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -11,7 +11,7 @@ prefix=
 
 -include Makefile.inc
 
-VPATH = ../src:../interface
+VPATH = ${top_srcdir}/src:${top_srcdir}/interface
 
 default all: compile
 
@@ -99,7 +99,7 @@ install:
 clean:
 	rm -rvf .libs *.o *.lo ${PLUGIN_LIB} ${MACHINE_LIB}
 	rm -rfv job_attrs.h job_attrs2.h lb-job-attrs2.xsd glite-jpis-config.xml
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 check:
 	@echo No tests yet
@@ -129,10 +129,10 @@ lb_plugin.lo: lb_plugin.c job_attrs.h job_attrs2.h
 	${COMPILE} -DPLUGIN_DEBUG -o $@ -c $<
 
 job_attrs.h: lb-job-attrs.xsd job_attrs.xsl
-	${XSLTPROC} ../src/job_attrs.xsl $< >$@
+	${XSLTPROC} ${top_srcdir}/src/job_attrs.xsl $< >$@
 
 job_attrs2.h: lb-job-attrs2.xsd job_attrs2.xsl
-	${XSLTPROC} ../src/job_attrs2.xsl $< >$@
+	${XSLTPROC} ${top_srcdir}/src/job_attrs2.xsl $< >$@
 
 glite-jpis-config.xml: lb-job-attrs2.xsd jpis_config.xsl
-	${XSLTPROC} ../src/jpis_config.xsl lb-job-attrs2.xsd >$@
+	${XSLTPROC} ${top_srcdir}/src/jpis_config.xsl lb-job-attrs2.xsd >$@
diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile
index 29733a0..34b64dc 100644
--- a/org.glite.lb.types/Makefile
+++ b/org.glite.lb.types/Makefile
@@ -1,4 +1,5 @@
 stagedir=../stage
+top_srcdir=.
 
 -include Makefile.inc
 
@@ -9,25 +10,25 @@ SCRIPTS=at3 check_version.pl
 
 default: compile
 
-compile: at3
-
-at3: at3.in
-	#XXX: sed "s?%PREFIX%?${stagedir}?" at3.in >$@
-	cp at3.in $@
+compile:
 
 stage: compile
 	$(MAKE) install PREFIX=${stagedir}
 
 install: compile
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3 ${DESTDIR}${PREFIX}${prefix}/sbin
-	install -m 644 ${PM} ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB
-	install -m 644 ${T} ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3
-	for p in ${SCRIPTS} ; do \
-		install -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-$$p"; \
+	for p in ${PM} ; do \
+		install -m 644 ${top_srcdir}/$$p ${DESTDIR}${PREFIX}${prefix}/share/perl/gLite/LB; \
+	done
+	for p in ${T} ; do \
+		install -m 644 ${top_srcdir}/$$p ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/at3; \
 	done
+	install -m 755 ${top_srcdir}/at3.in ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-at3
+	install -m 755 ${top_srcdir}/check_version.pl ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-check_version.pl
 	
 clean:
-	rm -vf at3
-	rm -rvf log.xml project/glite-lb-types.spec rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 check:
+
+.PHONY: default compile stage install check clean
diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 0c94660..b770178 100644
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -12,7 +12,7 @@ expat_prefix=/opt/expat
 gsoap_prefix=/opt/gsoap
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -120,7 +120,7 @@ install:
 
 clean:
 	rm -rfv ${ALLUTILS} ${MAN_GZ} ${MAN8_GZ} *.lo *.o .libs/
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.o: %.c
 	${COMPILE} -c $<
diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index 2a9946b..68ea67b 100644
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -11,7 +11,7 @@ PREFIX=/opt/glite
 prefix=
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -61,7 +61,7 @@ install:
 
 clean:
 	rm -vf *.h *.html *.xml *.wsdl glue2-copy.xsd
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.xml: %.xml.T
 	rm -f $@
@@ -69,17 +69,17 @@ clean:
 	chmod -w $@ >/dev/null
 
 ${WSDL}: %.wsdl: %.xml puke-wsdl.xsl
-	${XSLTPROC} ../src/puke-wsdl.xsl $< >$@
+	${XSLTPROC} ${top_srcdir}/src/puke-wsdl.xsl $< >$@
 	-${TIDY} -xml -m $@
 # XXX: obsolete:
 #	-perl -i -n -e 'if (/^\s*$$/) { $$empty .= "\n"; } elsif (/^\s*<(xsd:)?(enumeration|element|input|output|fault)/) { print $$_; $$empty = "";} else { print "$$empty$$_"; $$empty=""; }; ' $@
 
 LB.html: doc.xml LBTypes.xml LB.xml puke-ug.xsl
-	${XSLTPROC} --novalid ../src/puke-ug.xsl $< >doc-html.xml
+	${XSLTPROC} --novalid ${top_srcdir}/src/puke-ug.xsl $< >doc-html.xml
 	-${TIDY} -xml -m doc-html.xml
 #	${XMLLINT} --valid --noout doc-html.xml
 	${XSLTPROC} --stringparam  chapter.autolabel 0 ${docbookxls} doc-html.xml >$@
 	-${TIDY} -asxhtml -m $@
 
-ws_interface_version.h: ${top_srcdir}/project/version.properties
+ws_interface_version.h: ${top_srcdi${top_srcdir}/project/version.properties
 	echo "#define GLITE_LB_WS_INTERFACE_VERSION \"${version}\"" >$@
diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index 6fbe253..689b39b 100644
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -13,7 +13,7 @@ classads_prefix=/opt/classads
 voms_prefix=/opt/voms
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -85,7 +85,7 @@ install:
 
 clean:
 	rm -rvf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo *.nsmap soap_version.h ${CEXAMPLES} ${TESTS}
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 LB.xh: ws_typemap.dat ${stagedir}${prefix}/interface/LB.wsdl
 	${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}${prefix}/interface -o $@ ${stagedir}${prefix}/interface/LB.wsdl
diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile
index 5417642..a708753 100644
--- a/org.glite.lb.yaim/Makefile
+++ b/org.glite.lb.yaim/Makefile
@@ -6,7 +6,7 @@ PREFIX=/opt/glite
 prefix=
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 yaim_prefix=/opt/glite
 ifeq (${project},emi)
@@ -52,6 +52,6 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ ${FILES}
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/ ${FILES}
 
 .PHONY: default all check install stage clean
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 136cfc2..40b1747 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -837,7 +837,7 @@ for my $ext (keys %deps_aux) {
 );
 
 my @k = keys %deps_aux;
-@buildroot{@k} = ('build') x ($#k+1);
+@buildroot{@k} = ('') x ($#k+1);
 
 my @t = qw/lb.client-java jobid.api-java lb.types/;
 @buildroot{@t} = ('') x ($#t+1);
diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index 1a4cdeb..f593688 100644
--- a/org.glite.lbjp-common.db/Makefile
+++ b/org.glite.lbjp-common.db/Makefile
@@ -16,7 +16,7 @@ thrflavour=gcc32pthr
 nothrflavour=gcc32
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -176,7 +176,7 @@ install: all
 
 clean:
 	rm -rvf *.o *.lo *.loT .libs lib* *.c *.h *.dox C/ CPP/
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 	rm -rvf db_expire db_test db_test_mysql db_test_psql timezone
 
 db-mysql.o db-mysql.lo: db-mysql.c
diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile
index 941386d..50b0b27 100644
--- a/org.glite.lbjp-common.gsoap-plugin/Makefile
+++ b/org.glite.lbjp-common.gsoap-plugin/Makefile
@@ -20,11 +20,13 @@ gsoap_versions_flavours?=2.7.10
 
 -include Makefile.inc
 -include ../Makefile.inc
--include ../project/version.properties
--include ../../project/version.properties
+
+top_srcdir2?=${top_srcdir}
+include ${top_srcdir2}/project/version.properties
 
 version=${module.version}
 gsoap_versions_flavours:=${shell if ! echo ${gsoap_versions_flavours} | grep '\<${gsoap_default_version}\>' >/dev/null; then echo "${gsoap_default_version} "; else echo ''; fi} ${gsoap_versions_flavours}
+top_srcdir_l2:=$(shell if echo ${top_srcdir} | grep '^/' >/dev/null; then echo "${top_srcdir}"; else echo "../${top_srcdir}"; fi)
 
 GSPLUGIN_DEBUG?=no
 GSPLUGIN_VERSION_CHECKING?=yes
@@ -57,7 +59,7 @@ langflavour:=_${lang}
 langsuffix:=.${lang}
 endif
 
-VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/interface
+VPATH=${top_srcdir2}/src:${top_srcdir2}/test:${top_srcdir2}/examples:${top_srcdir2}/interface
 
 default: all
 
@@ -95,7 +97,7 @@ endif
 CFLAGS:= ${CFLAGS} ${DEBUG} \
 	-DVERSION=\"${version}\" \
 	-DWITH_NONAMESPACES \
-	-I. -I${top_srcdir}/interface \
+	-I. -I${top_srcdir2}/interface \
 	-I${stagedir}${prefix}/include \
 	${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION
 
@@ -106,7 +108,7 @@ COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
-LINK_lang:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
+LINK_lang:=PATH=${top_srcdir2}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
 ifeq (${lang},c)
 LINK_lang:=${LINK}
 endif
@@ -221,7 +223,7 @@ check: check.cxx
 # C/C++ compatibility test
 # (C flavour, gsoap 2.7.10 ==> C++ test fails)
 check.cxx:
-	${MAKE} lang=cxx -f ${top_srcdir}/Makefile ${LTLIB_TEST_S} test_cxx
+	${MAKE} lang=cxx -f ${top_srcdir2}/Makefile ${LTLIB_TEST_S} test_cxx
 	LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_cxx
 
 examples: ${EXAMPLES}
@@ -230,13 +232,13 @@ all-libs-with-soap:
 	for v in ${gsoap_versions_noflavours}; do	\
 		dir=`echo $$v | tr -d .`; \
 		mkdir $$dir; \
-		${MAKE} -C $$dir -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang= libs-with-soap || exit $?; \
+		${MAKE} -C $$dir -f ${top_srcdir_l2}/Makefile gsoap_version=$$v top_srcdir2=${top_srcdir_l2} lang= libs-with-soap || exit $?; \
 	done
 	for v in ${gsoap_versions_flavours}; do	\
 		dir=`echo $$v | tr -d .`; \
 		mkdir $$dir; \
-		${MAKE} -C $$dir -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang=c libs-with-soap || exit $?; \
-		${MAKE} -C $$dir -f ../Makefile gsoap_version=$$v top_srcdir=../.. lang=cxx libs-with-soap || exit $?; \
+		${MAKE} -C $$dir -f ${top_srcdir_l2}/Makefile gsoap_version=$$v top_srcdir2=${top_srcdir_l2} lang=c libs-with-soap || exit $?; \
+		${MAKE} -C $$dir -f ${top_srcdir_l2}/Makefile gsoap_version=$$v top_srcdir2=${top_srcdir_l2} lang=cxx libs-with-soap || exit $?; \
 	done
 
 libs-with-soap: ${lib_LTLIBRARIES_S}
@@ -246,9 +248,9 @@ gsoap_srcname=gsoap-`echo ${gsoap_version} | cut -d. -f1,2`
 link-gsoap:
 	if [ ${gsoap_version} = ${gsoap_default_version} ]; then \
 		ln -sf ${gsoap_prefix}/include/stdsoap2.h stdsoap2.h; \
-	elif [ -f ${top_srcdir}/src/stdsoap2_${gsoap_version}.c ]; then \
-		ln -sf ${top_srcdir}/src/stdsoap2_${gsoap_version}.c stdsoap2.c; \
-		ln -sf ${top_srcdir}/src/stdsoap2_${gsoap_version}.h stdsoap2.h; \
+	elif [ -f ${top_srcdir2}/src/stdsoap2_${gsoap_version}.c ]; then \
+		ln -sf ${top_srcdir2}/src/stdsoap2_${gsoap_version}.c stdsoap2.c; \
+		ln -sf ${top_srcdir2}/src/stdsoap2_${gsoap_version}.h stdsoap2.h; \
 	elif [ -f ${ext_repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.c ]; then \
 		ln -sf ${ext_repository}/${gsoap_name}/${gsoap_version}/src/stdsoap2.[ch] .; \
 	elif [ -f ${ext_repository}/${gsoap_name}/${gsoap_version}/${gsoap_platform}/stdsoap2.c ]; then \
@@ -291,7 +293,7 @@ soapcpp:=${shell if [ -x ${gsoap_prefix}/bin/soapcpp2 ]; then \
 	fi}
 
 ${GSOAP_FPREFIX}H.h ${GSOAP_FPREFIX}C.c ${GSOAP_FPREFIX}Server.c ${GSOAP_FPREFIX}Client.c ${GSOAP_FPREFIX}ServerLib.c ${GSOAP_FPREFIX}ClientLib.c: calc.h.S
-	${soapcpp} -c -p ${GSOAP_FPREFIX} ${top_srcdir}/examples/calc.h.S
+	${soapcpp} -c -p ${GSOAP_FPREFIX} ${top_srcdir2}/examples/calc.h.S
 
 wscalc_clt_ex.o: wscalc_clt_ex.c
 	${CC} -c ${CFLAGS} -o $@ $<
@@ -304,7 +306,7 @@ sizeof_soap: sizeof_soap.o
 
 glite_gscompat.h: glite_gscompat.h.in sizeof_soap
 	size=${shell ./sizeof_soap}; \
-	sed "s/@sizeof_struct_soap@/$$size/" ${top_srcdir}/interface/glite_gscompat.h.in > $@
+	sed "s/@sizeof_struct_soap@/$$size/" ${top_srcdir2}/interface/glite_gscompat.h.in > $@
 
 doc:
 
@@ -316,15 +318,15 @@ install:
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security/
-	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-	cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/glite/security/
+	${INSTALL} -m 644 ${top_srcdir2}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+	cd ${top_srcdir2}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/glite/security/
 	${INSTALL} -m 644 glite_gscompat.h ${DESTDIR}${PREFIX}${prefix}/include/glite/security/
 	for v in ${gsoap_versions_noflavours}; do \
-		${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang= PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \
+		${MAKE} -C `echo $$v | tr -d .` -f ${top_srcdir_l2}/Makefile install-soaplib gsoap_version=$$v lang= PREFIX=${PREFIX} top_srcdir2=${top_srcdir_l2} || exit $?; \
 	done
 	for v in ${gsoap_versions_flavours}; do \
-		${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang=c PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \
-		${MAKE} -C `echo $$v | tr -d .` -f ../Makefile install-soaplib gsoap_version=$$v lang=cxx PREFIX=${PREFIX} top_srcdir=${top_srcdir}/.. || exit $?; \
+		${MAKE} -C `echo $$v | tr -d .` -f ${top_srcdir_l2}/Makefile install-soaplib gsoap_version=$$v lang=c PREFIX=${PREFIX} top_srcdir2=${top_srcdir_l2} || exit $?; \
+		${MAKE} -C `echo $$v | tr -d .` -f ${top_srcdir_l2}/Makefile install-soaplib gsoap_version=$$v lang=cxx PREFIX=${PREFIX} top_srcdir2=${top_srcdir_l2} || exit $?; \
 	done
 
 install-soaplib:
@@ -337,7 +339,7 @@ clean:
 	rm -rvf *.c *.h *.xml *.nsmap *.o *.lo .libs ${EXAMPLES} ${TESTS}
 	rm -rvf CalcService.wsdl wscalc.xsd
 	rm -rvf glite_gscompat.h sizeof_soap
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 	for v in ${gsoap_versions_noflavours} ${gsoap_versions_flavours}; do \
 		rm -rvf `echo $$v | tr -d .`; \
 	done
diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 075f796..87fce4d 100644
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -16,7 +16,7 @@ cppunit_prefix=/opt/cppunit
 CC=gcc
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -158,7 +158,7 @@ install:
 
 clean:
 	rm -rf *.o *.lo *.a *.la .libs test_gss
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.o: %.c
 	${COMPILE} ${GLOBUS_GSSAPI_GSI_CFLAGS} ${LIBCARES_CFLAGS} -o $@ -c $<
diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile
index cf54694..552b366 100644
--- a/org.glite.lbjp-common.jp-interface/Makefile
+++ b/org.glite.lbjp-common.jp-interface/Makefile
@@ -17,7 +17,7 @@ gsoap_prefix=/software/gsoap-2.6
 CC=gcc
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -102,7 +102,7 @@ install:
 
 clean:
 	rm -rvf *.o *.lo .libs lib*
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 	rm -vf type_test type_test.xml
 	rm -f glite jp
 
diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index 5ccf485..f41d7af 100644
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -13,7 +13,7 @@ sysconfdir=/etc
 log4c_prefix=/usr
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -78,7 +78,7 @@ install: compile
 
 clean:
 	rm -rvf *.o *.lo .libs lib*
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 	rm -rvf test
 
 check: test
diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile
index fed15db..27de2a6 100644
--- a/org.glite.lbjp-common.maildir/Makefile
+++ b/org.glite.lbjp-common.maildir/Makefile
@@ -16,7 +16,7 @@ thrflavour=gcc32pthr
 nothrflavour=gcc32
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -94,7 +94,7 @@ install: all
 
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.o %.lo: %.c
 	${COMPILE} -c $<
diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile
index f748493..4709fa2 100644
--- a/org.glite.lbjp-common.server-bones/Makefile
+++ b/org.glite.lbjp-common.server-bones/Makefile
@@ -11,7 +11,7 @@ prefix=
 CC=gcc
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -92,7 +92,7 @@ install:
 
 clean:
 	rm -rvf *.o *.lo .libs lib* srv_example cnt_example
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 %.o: %.c
 	${COMPILE} -c $<
diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index db72b1c..9af068f 100644
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -12,7 +12,7 @@ lbuprefix=lbu
 prefix=
 
 -include Makefile.inc
--include ../project/version.properties
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -109,7 +109,7 @@ install: all
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
 	rm -vf trio_test
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 	
 %.o: %.c
 	${COMPILE} ${CFLAGS} -c $<
diff --git a/org.glite.px.glite-PX/Makefile b/org.glite.px.glite-PX/Makefile
index 55624f6..ce91d5f 100644
--- a/org.glite.px.glite-PX/Makefile
+++ b/org.glite.px.glite-PX/Makefile
@@ -18,6 +18,6 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
 .PHONY: default all check install stage clean
diff --git a/org.glite.px.myproxy-yaim/Makefile b/org.glite.px.myproxy-yaim/Makefile
index be4deb7..d8bda34 100644
--- a/org.glite.px.myproxy-yaim/Makefile
+++ b/org.glite.px.myproxy-yaim/Makefile
@@ -54,6 +54,6 @@ stage:
 check:
 
 clean:
-	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ ${FILES}
+	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/ ${FILES}
 
 .PHONY: default all check install stage clean