From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 26 Jun 2012 14:28:13 +0000 (+0000)
Subject: Simplified source tarball and packages distribution ("ETICS-less releases"):
X-Git-Tag: gridsite-core_R_1_7_22~59
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e954899ade98beb848a833b0b7b185c5c74ae077;p=jra1mw.git

Simplified source tarball and packages distribution ("ETICS-less releases"):
- list of the source files
- using ${package} and ${version} in each module's Makefile
- clean distribution files in 'clean'
- update .PHONY targets
- removed old dist, distsrc and distbin targets
- removed errorneous or obsolete files
---

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 59c86cb..df10e9f 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -1,7 +1,11 @@
 top_srcdir=.
 stagedir=../stage
+package=glite-lb-client-java
 
 -include Makefile.inc
+-include ${top_srcdir}/project/version.properties
+
+version=${module.version}
 
 # broken 
 # SimpleLLTest.class ProducerTestLL.class ProducerTestIL.class
@@ -10,6 +14,14 @@ FULL_EXAMPLES := $(addprefix ${top_srcdir}/examples/,SSLClient.java SSLServer.ja
 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)
 
+SOURCES=\
+	examples/*.java examples/*/*.java \
+	project/list-jars.sh project/genEventTypes.pl \
+	src_c/*.c src_c/Makefile \
+	src/org/glite/lb/*.java \
+	Makefile
+SOURCES_EXEC=project/list-jars.sh project/genEventTypes.pl
+
 VPATH := ${top_srcdir}/src/org/glite/lb ${top_srcdir}/examples ${top_srcdir}/examples/simple-ssl ${top_srcdir}/examples/simple-trustmanager
 
 JAVAC:=${jdk_prefix}/bin/javac
@@ -106,8 +118,9 @@ install:
 
 clean:
 	rm -rf build
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
-.PHONY: all compile compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar build-c examples genevents genws check stage install clean distclean wtf
+.PHONY: all compile compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar build-c examples genevents genws check stage install clean distclean wtf dist distcheck
diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 0d371e7..9dd722e 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -34,6 +34,17 @@ CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${check_ve
 
 SUFFIXES = .T .l
 
+SOURCES = \
+	doc/* \
+	examples/*.c examples/*.l examples/*.sh examples/Makefile examples/README.examples \
+	interface/*.h interface/*.h.T \
+	m4/*.m4 \
+	project/.post* \
+	src/*.c src/*.h src/*.T src/*.pl src/*.cpp \
+	test/*.c test/*.cpp test/*.T test/PLOT test/TEST \
+	LICENSE Makefile
+SOURCES_EXEC=examples/gen_* examples/*.pl examples/*.sh src/*.sh test/TEST
+
 l_SRC = \
 	chkpt.l \
 	cleared.l \
@@ -342,8 +353,6 @@ JobStatus.h JobStatus.cpp: StatusAttrNames.pl
 #	rm -f $@
 #	ln -s ${stagedir}${prefix}/share/perl/gLite/LB/$@ $@
 
-dist: distsrc distbin
-
 install:
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin
@@ -397,6 +406,7 @@ clean:
 	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 StatusAttrNames.pl uiwrap.T
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -425,4 +435,4 @@ post-install-rpath:
 		fi; \
 	done
 
-.PHONY: default all compile examples check stage install clean distclean check_version link post-install post-install-rpath
+.PHONY: default all compile examples check stage install clean distclean check_version link post-install post-install-rpath dist distcheck
diff --git a/org.glite.lb.client/examples/purge_test b/org.glite.lb.client/examples/purge_test
deleted file mode 100644
index d70b3dd..0000000
--- a/org.glite.lb.client/examples/purge_test
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/perl 
-#
-# Copyright (c) Members of the EGEE Collaboration. 2004-2010.
-# See http://www.eu-egee.org/partners/ for details on the copyright holders.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-BEGIN{
-$inst = $ENV{GLITE_PREFIX};
-$inst = "/opt/glite" unless $inst;
-$sbin = "$inst/sbin";
-$bin = "$inst/bin";
-$test = "$inst/examples";
-$purge = "$bin/glite-lb-purge";
-$status = "$test/glite-lb-job_status";
-$log = "$test/glite-lb-job_log";
-$prefix = "/tmp/purge_test_$$";
-$delay = 60;
-
-$ENV{PATH} .= ":$bin";
-}
-
-$option = shift;
-$server = shift;
-
-die qq{
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-   This script will DESTROY ALL DATA in the specified bookkeeping server.
-
-Don't run it unless you are absolutely sure what you are doing.
-If you really mean it, the magic usage is:
-
-   $0 --i-want-to-purge server:port
-
-Good luck!
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-	
-} unless $option eq '--i-want-to-purge';
-
-die "usage: $0 --i-want-to-purge server:port\n" unless $server;
-
-sub logit {
-	my $ids = shift;
-	my $prefix = shift;
-	my $failed = 0;
-
-	for (qw/aborted cleared cancelled waiting/) {
-		my $key = $_ eq waiting ? 'other' : $_;
-		$id = `$test/glite-lb-$_.sh -m $server`;
-		chomp $id;
-		die "$test/glite-lb-$_.sh" if $?;
-		$id =~ s/EDG_JOBID=//;
-		$ids->{$key} = $id;
-#print "$status $id | head -1\n";
-		$stat = `$status $id | head -2 | tail -1`;
-		chomp $stat;
-		$stat =~ s/state :\s*//;
-#print "$id: ".uc($stat)." ".uc($_)."\n";
-		$failed = 1 if uc($stat) ne uc($_);
-
-		system "$log $id | grep -v '^[ 	]*\$' | grep -v '^Found' >${prefix}_$_";
-	}
-
-	!$failed;
-}
-	
-print "** Hey, purging the whole database\n";
-system "$purge --server $server --return-list --aborted=0 --cleared=0 --cancelled=0 --other=0";
-die "$purge: $!\n" if $!;
-
-print "** Logging test jobs\n";
-
-die "!! failed\n" if !logit \%old,"${prefix}_old";
-print "** So far good, sleeping $delay seconds\n";
-sleep $delay;
-print "** OK, another set of jobs\n";
-die "!! failed\n" if !logit \%new,"${prefix}_new";
-
-print "** Dry run\n";
-$failed = 0;
-
-$half = $delay/2;
-for (qw/aborted cleared cancelled other/) {
-	open LIST,"$purge --server $server --dry-run --return-list --$_=${half}s| grep '^https://'|" or die "!! run $purge\n"; 
-
-	$id = <LIST>; chomp $id;
-	if ($old{$_} ne $id) {
-		$failed = 1;
-		print "!! $old{$_} (old $_) is not there\n";
-	}
-	else {
-		print "$_ $id OK\n";
-	}
-	$id = <LIST>;
-	if ($id) {
-		$failed = 1;
-		chomp $id;
-		print "!! $id should not be there\n";
-	}
-	close LIST;
-
-	open LIST,"$purge --server $server --dry-run --return-list --$_=0s | grep '^https://'|" or die "!! run $purge\n"; 
-
-	$cnt = 0;
-	while ($id = <LIST>) {
-		chomp $id;
-		if ($old{$_} ne $id && $new{$_} ne $id) {
-			$failed = 1;
-			print "!! $id should not be there\n";
-		}
-		else {
-			print "$_ $id OK\n";
-		}
-		$cnt++;
-	}
-	
-	close LIST;
-	if ($cnt != 2) {
-		$failed = 1;
-		print "!! bad number of $_ jobs ($cnt)\n";
-	}
-}
-
-die "!! aborting\n" if $failed;
-
-print "** Server defaults\n";
-
-open LIST,"$purge --server $server --dry-run --return-list | grep '^https://'|" or die "!! run $purge\n";
-
-$failed = 0;
-while ($id = <LIST>) {
-	$failed = 1;
-	print "$id\n";
-}
-
-die "!! Oops, should not do anything, too short defaults?\n" if $failed;
-
-print "Nothing purged as expected\n";
-
-print "** Purge the first set of jobs\n";
-
-open DUMP,"$purge --server $server --server-dump --aborted=${half}s --cleared=${half}s --cancelled=${half}s --other=${half}s | grep '^Server dump:'|"
-	or die "!! run $purge\n";
-
-$dump = <DUMP>; chomp $dump; $dump =~ s/Server dump: //;
-close DUMP;
-
-die "!! no dump file reported\n" unless $dump;
-#print "DEBUG: dump file: '$dump'\n";
-@list = glob "${prefix}_old*";
-system "cat @list | sort >${prefix}_old_all";
-system "cat $dump | sed -e s/^.*DATE/DATE/ | sort >${prefix}_old_dump";
-sleep 60;
-system "diff ${prefix}_old_all ${prefix}_old_dump >/dev/null";
-
-die "!! aggregate log and dump differ\n" if $? & 0xff00;
-
-print "diff OK\n";
-
-print "** Purge the rest\n";
-open DUMP,"$purge --server $server --server-dump --aborted=0 --cleared=0 --cancelled=0 --other=0 | grep '^Server dump:'|"
-	or die "!! run $purge\n";
-
-$dump = <DUMP>; chomp $dump; $dump =~ s/Server dump: //;
-close DUMP;
-
-die "!! no dump file reported\n" unless $dump;
-#print "DEBUG: dump file: '$dump'\n";
-@list = glob "${prefix}_new*";
-system "cat @list | sort >${prefix}_new_all";
-system "cat $dump | sed -e s/^.*DATE/DATE/ | sort >${prefix}_new_dump";
-system "diff ${prefix}_new_all ${prefix}_new_dump >/dev/null";
-
-die "!! aggregate log and dump differ\n" if $? & 0xff00;
-
-print "diff OK\n";
-
-
-print "** Anything left?\n";
-open LIST,"$purge --server $server --return-list --dry-run --aborted=0 --cleared=0 --cancelled=0 --other=0 | grep '^https://'|" or die "!! $purge\n";
-
-$id = <LIST>;
-close LIST;
-die "!! Yes, but should not\n" if $id;
-print "No, OK\n";
-
-print "\n** All tests passed **\n";
-exit 0;
-
-END{ unlink glob "${prefix}*" if $prefix; }
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 432c878..0a5bf09 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -14,10 +14,10 @@ expat_prefix=/opt/expat
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
 
-jobiddir=${top_srcdir}/../org.glite.jobid.api-c
-
 version=${module.version}
 
+jobiddir=${top_srcdir}/../org.glite.jobid.api-c
+
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc
 AT3=${stagedir}${prefix}/sbin/glite-lb-at3
 
@@ -25,6 +25,17 @@ SUFFIXES = .T
 
 CC=gcc
 
+SOURCES=\
+	doc/*.dox doc/*.tex.T \
+	examples/perf_*.log \
+	interface/*.h interface/*.h.T \
+	m4/*.m4 \
+	project/.post* \
+	src/*.c src/*.c.T src/*.sh \
+	test/*.cpp test/*.cpp.T \
+	LICENSE Makefile
+SOURCES_EXEC=src/*.sh
+
 DEBUG:=-g -O0 -Wall
 
 ifdef LB_STANDALONE
@@ -240,6 +251,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 dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -272,3 +284,5 @@ il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp test_
 	rm -f $@
 	${AT3} $< >$@ || ( rm -f $@; false )
 	chmod -w $@ >/dev/null
+
+.PHONY: default all generate compile stage check mkreports check.parse check.il testcoverage doc olddoc install clean distclean dist distcheck
diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile
index 281d3b4..ee66e1c 100644
--- a/org.glite.lb.doc/Makefile
+++ b/org.glite.lb.doc/Makefile
@@ -14,6 +14,10 @@ prefix=
 version=${module.version}
 
 VPATH = ${top_srcdir}/src
+SOURCES=\
+	examples/*.c examples/*.cpp examples/Makefile examples/README* examples/*.C \
+	src/lbjp.bib src/*.cls src/*.sty src/*.tex src/*.tex.T src/README* src/images/*.pdf \
+	GGUS19469-reply.txt LICENSE Makefile
 # example source code is part of the org.glite.lb.client
 EXAMPLE_SOURCE_DIR=${top_srcdir}/examples
 KPATH = TEXINPUTS=".:$(EXAMPLE_SOURCE_DIR):$(VPATH)//:"
@@ -79,6 +83,7 @@ install:
 
 clean:
 	rm -rvf LBUG* LBAG* LBDG* LBTP* events.tex status.tex ver.tex comment*
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -136,4 +141,4 @@ LBTG.pdf: ${COMMON} \
 	LBTG-Abstract.tex \
 	LBAG-Troubleshooting.tex
 
-.PHONY: default all generate doc stage check install clean distclean doc
+.PHONY: default all generate doc stage check install clean distclean doc dist distcheck
diff --git a/org.glite.lb.emi-lb/Makefile b/org.glite.lb.emi-lb/Makefile
index c035bc2..92480e9 100644
--- a/org.glite.lb.emi-lb/Makefile
+++ b/org.glite.lb.emi-lb/Makefile
@@ -1,6 +1,6 @@
 top_srcdir=..
 stagedir=.
-package=glite-lb-emi-lb
+package=emi-lb
 version=0.0.0
 PREFIX=/opt/glite
 prefix=
@@ -8,6 +8,10 @@ prefix=
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
 
+version=${module.version}
+
+SOURCES=Makefile
+
 default all:
 
 install:
@@ -18,8 +22,9 @@ stage:
 check:
 
 clean:
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
-.PHONY: default all check install stage clean distclean
+.PHONY: default all check install stage clean distclean dist distcheck
diff --git a/org.glite.lb.glite-LB/Makefile b/org.glite.lb.glite-LB/Makefile
index 13a1e41..0e7b0a9 100644
--- a/org.glite.lb.glite-LB/Makefile
+++ b/org.glite.lb.glite-LB/Makefile
@@ -1,6 +1,6 @@
 top_srcdir=..
 stagedir=.
-package=glite-lb-yaim
+package=glite-LB
 version=0.0.0
 PREFIX=/opt/glite
 prefix=
@@ -8,6 +8,10 @@ prefix=
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
 
+version=${module.version}
+
+SOURCES=Makefile
+
 default all:
 
 install:
@@ -19,5 +23,6 @@ check:
 
 clean:
 	rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+	rm -rvf dist ${package}-*.tar.gz
 
-.PHONY: default all check install stage clean
+.PHONY: default all check install stage clean dist distcheck
diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index a97cf79..b421cd7 100644
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -1,7 +1,6 @@
 top_srcdir=..
 stagedir=.
 package=glite-lb-harvester
-module.version=0.0.0
 PREFIX=/opt/glite
 prefix=
 sysconfdir=/opt/glite/etc
@@ -10,11 +9,21 @@ libdir=lib
 
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
-version:=${module.version}
+
+version=${module.version}
 
 CC=gcc
 VPATH=${top_srcdir}/src:${top_srcdir}/doc
 
+SOURCES=\
+	config/startup \
+	doc/* \
+	examples/test.* \
+	project/.post* project/.pre* \
+	src/*.c \
+	Makefile
+SOURCES_EXEC=config/startup examples/*.sh
+
 CPPFLAGS:=-I${stagedir}${prefix}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS}
 CFLAGS:=-W -Wall -g -O2 ${CFLAGS}
 LDFLAGS:=${LDFLAGS} 
@@ -82,8 +91,9 @@ install: compile
 	${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-harvester
 
 clean:
-	rm -rfv *.o *.lo *.loT .libs/ manpage.links manpage.refs
-	rm -rvf harvester harvester-dbg glite-lb-harvester.* startup
+	rm -rfv *.o *.lo *.loT .libs/ manpage.links manpage.refs *.log
+	rm -rvf harvester harvester-dbg glite-lb-harvester.1 startup
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -103,4 +113,4 @@ harvester-dbg.o: harvester.c
 %.1: %.sgml
 	docbook2man $<
 
-.PHONY: default all compile debug check doc stage install clean distclean
+.PHONY: default all compile debug check doc stage install clean distclean dist distcheck
diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index 6fe72d8..98818c1 100644
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -21,6 +21,14 @@ CXX=gcc
 
 VPATH:=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc:${top_srcdir}/examples:${top_srcdir}/config
 
+SOURCES=\
+	config/msg.* \
+	examples/*.cpp \
+	project/il.conf \
+	src/*.cpp src/msg-* \
+	LICENSE Makefile
+SOURCES_EXEC=src/msg-brokers
+
 VERSION=-DVERSION=\"GLite-${version}\"
 
 ACTIVEMQ_CFLAGS?=`PKG_CONFIG_PATH=${activemq_prefix}/${libdir}/pkgconfig pkg-config --cflags activemq-cpp`
@@ -128,6 +136,9 @@ install:
 
 clean:
 	rm -rvf .libs/ *.o *.lo ${PLUGIN_LIB} ${MAN_GZ} ${EXAMPLES}
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all compile man stage check install clean distclean dist distcheck
diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 9078137..2f196dd 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -18,6 +18,17 @@ CC=gcc
 
 VPATH:=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/doc
 
+SOURCES=\
+	config/startup config/glite-lb-logger.* \
+	doc/*.8 \
+	interface/*.h \
+	project/.post* project/.pre* \
+	src/*.c src/*.cpp src/*.h src/*.sh \
+	src-nt/*.cpp src-nt/*.H src-nt/Makefile src-nt/test/*.cpp \
+	test/*.c test/*.cpp test/*.h \
+	LICENSE Makefile
+SOURCES_EXEC=config/startup src/*.sh
+
 VERSION=-DVERSION=\"GLite-${version}\"
 
 SUFFIXES=.no
@@ -244,6 +255,9 @@ 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 dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all compile man stage check check.il check.ll install clean distclean dist distcheck
diff --git a/org.glite.lb.nagios/Makefile b/org.glite.lb.nagios/Makefile
index 2321127..c54f5aa 100644
--- a/org.glite.lb.nagios/Makefile
+++ b/org.glite.lb.nagios/Makefile
@@ -10,6 +10,9 @@ INSTALL=install
 
 version=${module.version}
 
+SOURCES=src/LB-probe Makefile
+SOURCES_EXEC=src/LB-probe
+
 all:
 
 install:
@@ -28,8 +31,9 @@ check:
 	@echo "No test"
 
 clean:
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
-.PHONY: all install stage clean check
+.PHONY: all install stage clean check distclean dist distcheck
diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 0868372..456b331 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -24,6 +24,16 @@ gridsite_prefix=/opt/glite
 
 version=${module.version}
 
+SOURCES=\
+	config/glite-lb-* config/my.cnf config/site-notif.conf config/startup \
+	doc/*.1 doc/*.8 \
+	interface/*.h \
+	src/*.c src/*.cpp src/*.h src/*.c.T src/*.l src/*.y src/*.sh src/ws_typemap.dat \
+	project/.post* project/.pre* \
+	test/*.cpp test/*.cpp.T test/*.sh test/oneJob.qry \
+	LICENSE Makefile
+SOURCES_EXEC=config/startup src/*.sh test/*.sh
+
 default all: compile
 
 GLITE_LB_SERVER_WITH_WS=yes
@@ -412,8 +422,9 @@ ifdef LB_PERF
 endif
 
 clean:
-	rm -rvf *.c *.cpp *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} ${TESTS} ${MAN_GZ} ${EXAMPLES} ${SCRIPTS}
+	rm -rvf *.c *.cpp *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-bkindex glite-lb-bkserverd glite-lb-mon-db ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} ${TESTS} ${MAN_GZ} ${EXAMPLES} ${SCRIPTS} ${MAN_GZ}
 	rm -rvf test_xml.cpp
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -457,3 +468,4 @@ ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
 bkserverd.o ws_fault.o: soap_version.h
 endif
 
+.PHONY: default all compile check test_coverage test.xml test.query examples doc man stage install clean distclean dist distcheck
diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 2906a0b..83488f1 100644
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -14,14 +14,18 @@ version=${module.version}
 
 VPATH = ${top_srcdir}/src:${top_srcdir}/interface
 
-default all: compile
-
 CC=gcc
 CXX=g++
 AT3=${stagedir}${prefix}/sbin/glite-lb-at3
 
 SUFFIXES = .T 
 
+SOURCES=\
+	interface/*.h interface/*.xsd interface/*.xsd.T \
+	project/.post* \
+	src/*.c src/*.xsl \
+	LICENSE Makefile
+
 ifneq (${classads_prefix},/usr)
 	classadslib := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib 
 endif
@@ -115,6 +119,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 dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -151,3 +156,5 @@ job_attrs2.h: lb-job-attrs2.xsd job_attrs2.xsl
 
 glite-jpis-config.xml: lb-job-attrs2.xsd jpis_config.xsl
 	${XSLTPROC} ${top_srcdir}/src/jpis_config.xsl lb-job-attrs2.xsd >$@ || ( rm -f $@; false)
+
+.PHONY: default all compile doc stage clean distclean check dist distcheck
diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile
index bdbba94..8ef9aa4 100644
--- a/org.glite.lb.types/Makefile
+++ b/org.glite.lb.types/Makefile
@@ -1,17 +1,24 @@
 stagedir=../stage
 top_srcdir=.
+package=glite-lb-types
 
 -include Makefile.inc
+-include ${top_srcdir}/project/version.properties
+
+version=${module.version}
 
 globalprefix=glite
 lbprefix=lb
 
+SOURCES=interface/*.h at3.in *.pm *.T check_version.pl Makefile
+SOURCES_EXEC=at3.in check_version.pl
+
 PM=StructField.pm MultiStruct.pm
 T=events.T status.T types.T
 SCRIPTS=at3 check_version.pl
 HDRS=lb_types.h
 
-default: compile
+default all: compile
 
 compile:
 
@@ -31,10 +38,11 @@ install: compile
 	(cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) 
 	
 clean:
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
 check:
 
-.PHONY: default compile stage install check clean distclean
+.PHONY: default all compile stage install check clean distclean dist distcheck
diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 79d1758..fa0a175 100644
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -18,6 +18,13 @@ version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/doc
 
+SOURCES=\
+	doc/*.1 doc/*.8 doc/README.* \
+	examples/glite-lb-* \
+	src/*.c src/*.c.T src/*.sh \
+	LICENSE Makefile
+SOURCES_EXEC=examples/*.sh src/*.sh
+
 CC=gcc
 AT3=${stagedir}${prefix}/sbin/glite-lb-at3
 
diff --git a/org.glite.lb.ws-interface/.Makefile.swp b/org.glite.lb.ws-interface/.Makefile.swp
deleted file mode 100644
index 15a25d6..0000000
Binary files a/org.glite.lb.ws-interface/.Makefile.swp and /dev/null differ
diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index 25cf760..68d7287 100644
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -24,6 +24,12 @@ XMLLINT:=xmllint --nonet
 TIDY=tidy -i -q --show-warnings no --tidy-mark no --wrap 0
 docbookxls:=http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
 
+SOURCES=\
+	examples/*.pl \
+	src/*.xsd src/*.xml src/*.xml.T src/*.wsdl src/*.xsl src/README* \
+	LICENSE Makefile
+SOURCES_EXEC=examples/*.pl
+
 STAGETO=share/wsdl/glite-lb
 
 WSDL=LB.wsdl LBTypes.wsdl
@@ -61,6 +67,7 @@ install:
 
 clean:
 	rm -vf *.h *.html *.xml *.wsdl glue2-copy.xsd
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -85,3 +92,5 @@ LB.html: doc.xml LBTypes.xml LB.xml puke-ug.xsl
 
 ws_interface_version.h: ${top_srcdi${top_srcdir}/project/version.properties
 	echo "#define GLITE_LB_WS_INTERFACE_VERSION \"${version}\"" >$@
+
+.PHONY: all compile check stage install clean distclean dist distcheck
diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index a21624e..9b3ec96 100644
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -1,5 +1,6 @@
 top_srcdir=..
 stagedir=.
+package=glite-lb-ws-test
 version=0.0.0
 PREFIX=/opt/glite
 prefix=
@@ -17,6 +18,12 @@ voms_prefix=/opt/voms
 
 version=${module.version}
 
+SOURCES=\
+	examples/*.c examples/*.h examples/*.pl examples/ws_typemap.dat \
+	tests/*.c \
+	Makefile
+SOURCES_EXEC=examples/*.sh
+
 CEXAMPLES:=ws_getversion ws_jobstat ws_joblog ws_lb4agu_GetActivityStatus ws_lb4agu_GetActivityInfo
 #TODO ws_query_ex 
 TESTS:=sizeof_soap_test
@@ -85,6 +92,7 @@ install:
 
 clean:
 	rm -rvf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo *.nsmap soap_version.h ${CEXAMPLES} ${TESTS}
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -97,4 +105,4 @@ soap_version.h:
 	perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]?).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''".($$4?$$4:"\\0")."'\''\n",$$1,$$2,$$3' soapH.h >$@
 	-rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 
-.PHONY: default all check stage install clean distclean
+.PHONY: default all check stage install clean distclean dist distcheck
diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile
index ef25e74..3195611 100644
--- a/org.glite.lb.yaim/Makefile
+++ b/org.glite.lb.yaim/Makefile
@@ -8,11 +8,18 @@ prefix=
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
 
+version=${module.version}
+
 yaim_prefix=/opt/glite
 ifeq (${project},emi)
 yaim_project=/emi
 endif
 
+SOURCES=\
+	config/defaults/glite-lb.pre \
+	config/functions/* config/functions/emi/* \
+	config/node-info.d/glite-lb config/node-info.d/emi/glite-lb \
+	Makefile
 FILES=glite-lb.pre config_glite_lb LICENSE COPYRIGHT node-version arch service update
 
 all ${FILES}:
@@ -26,7 +33,7 @@ all ${FILES}:
 	# metapackage info
 	echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE
 	cp LICENSE COPYRIGHT
-	echo ${module.version}-${module.age} > node-version
+	echo ${version}-${module.age} > node-version
 	echo ${platformArch} > arch
 	echo "NA" > service
 	echo "NA" > update
@@ -41,7 +48,7 @@ install: ${FILES}
 	install -m 0644 config_glite_lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions
 	install -m 0644 ${top_srcdir}/config/node-info.d${yaim_project}/glite-lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d
 	install -m 0644 glite-lb.pre ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults
-	echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package)
+	echo "$(package) $(version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package)
 	mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-LB
 	cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-LB/
 
@@ -51,8 +58,9 @@ stage:
 check:
 
 clean:
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
-.PHONY: default all check install stage clean distclean
+.PHONY: default all check install stage clean distclean dist distcheck