Don't delete debian/ directory from 'clean' target (preparation for new packaging).

diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile
index f1de15c..c403eed 100644 (file)
--- a/org.glite.jobid.api-c/Makefile
+++ b/org.glite.jobid.api-c/Makefile
@@ -68,7 +68,9 @@ 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 rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 stage:
        $(MAKE) install PREFIX=${stagedir}
@@ -84,4 +86,4 @@ install: ${LIB}
        ${COMPILE} -o $@ -c $< 
 
 
-.PHONY: default all compile check stage install clean
+.PHONY: default all compile check stage install clean distclean

diff --git a/org.glite.jobid.api-cpp/Makefile b/org.glite.jobid.api-cpp/Makefile
index ebb9ab0..7586462 100644 (file)
--- a/org.glite.jobid.api-cpp/Makefile
+++ b/org.glite.jobid.api-cpp/Makefile
@@ -43,7 +43,9 @@ check: compile
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 install: 
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix}
@@ -56,4 +58,4 @@ stage:
        ${COMPILE} -o $@ -c $< 
 
 
-.PHONY: default all compile check install clean
+.PHONY: default all compile check install clean distclean

diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile
index 77bde52..9f11d6b 100644 (file)
--- a/org.glite.jobid.api-java/Makefile
+++ b/org.glite.jobid.api-java/Makefile
@@ -19,6 +19,8 @@ check:
 
 clean:
        ${ant_prefix}/bin/ant ${ANT_ARGS} clean
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
-.PHONY: all compile stage install check clean
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: all compile stage install check clean distclean

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index ebf358d..574bfc3 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -103,6 +103,8 @@ install:
 
 clean:
        rm -rf build
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ 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:
+       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

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 6c1d1fa..5b858f1 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -396,7 +396,9 @@ 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 log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 check_version:
        ${CHECK_VERSION} ${stagedir}${prefix}/include/glite/lb/common_version.h
@@ -422,4 +424,4 @@ post-install-rpath:
                fi; \
        done
 
-.PHONY: default all compile examples check stage install clean 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

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index bddaa50..cc06da1 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -239,7 +239,9 @@ 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 rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 %.o: %.c
        ${COMPILE} ${CFLAGS} -c $<

diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile
index 0051699..1bd193b 100644 (file)
--- a/org.glite.lb.doc/Makefile
+++ b/org.glite.lb.doc/Makefile
@@ -78,7 +78,9 @@ install:
 
 clean:
        rm -rvf LBUG* LBAG* LBDG* LBTP* events.tex status.tex ver.tex comment*
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 
 # dependencies:
@@ -132,4 +134,4 @@ LBTG.pdf: ${COMMON} \
        LBTG-Abstract.tex \
        LBAG-Troubleshooting.tex
 
-.PHONY: all clean doc
+.PHONY: default all generate doc stage check install clean distclean doc

diff --git a/org.glite.lb.emi-lb/Makefile b/org.glite.lb.emi-lb/Makefile
index 13a1e41..c035bc2 100644 (file)
--- a/org.glite.lb.emi-lb/Makefile
+++ b/org.glite.lb.emi-lb/Makefile
@@ -1,6 +1,6 @@
 top_srcdir=..
 stagedir=.
-package=glite-lb-yaim
+package=glite-lb-emi-lb
 version=0.0.0
 PREFIX=/opt/glite
 prefix=
@@ -18,6 +18,8 @@ stage:
 check:
 
 clean:
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
-.PHONY: default all check install stage clean
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all check install stage clean distclean

diff --git a/org.glite.lb.glite-LB/Makefile b/org.glite.lb.glite-LB/Makefile
index 13a1e41..d35bfab 100644 (file)
--- 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-glite-LB
 version=0.0.0
 PREFIX=/opt/glite
 prefix=
@@ -18,6 +18,8 @@ stage:
 check:
 
 clean:
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
 
-.PHONY: default all check install stage clean
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all check install stage clean distclean

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index 0bf9435..8c94ae3 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -84,7 +84,9 @@ 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 rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 harvester: harvester.o
        ${LINK} -o $@ $+ ${LIBS}
@@ -102,4 +104,4 @@ harvester-dbg.o: harvester.c
        docbook2man $<
        mv $(@:.8=.1) $@
 
-.PHONY: default all compile debug check doc stage install clean
+.PHONY: default all compile debug check doc stage install clean distclean

diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index 8e7cc12..bc6d400 100644 (file)
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -115,4 +115,6 @@ install:
 
 clean:
        rm -rvf .libs/ *.o *.lo ${PLUGIN_LIB} ${MAN_GZ} ${EXAMPLES}
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 599e6a1..fbac674 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -244,4 +244,6 @@ 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 rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 907d76f..09bea31 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -386,7 +386,9 @@ endif
 clean:
        rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} ${TESTS} ${MAN_GZ} ${EXAMPLES} ${SCRIPTS}
        rm -rvf test_xml.cpp
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 %.c: %.c.T
        rm -f $@

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 500f128..4a71bb7 100644 (file)
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -116,7 +116,9 @@ 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 rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 check:
        @echo No tests yet

diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile
index 34b64dc..7f42572 100644 (file)
--- a/org.glite.lb.types/Makefile
+++ b/org.glite.lb.types/Makefile
@@ -27,8 +27,10 @@ install: compile
        install -m 755 ${top_srcdir}/check_version.pl ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-check_version.pl
        
 clean:
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 check:
 
-.PHONY: default compile stage install check clean
+.PHONY: default compile stage install check clean distclean

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 0ef00c1..b447860 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -120,7 +120,9 @@ install:
 
 clean:
        rm -rfv ${ALLUTILS} ${MAN_GZ} ${MAN8_GZ} *.lo *.o .libs/
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 %.o: %.c
        ${COMPILE} -c $<

diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index c148fc3..c605766 100644 (file)
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -61,7 +61,9 @@ install:
 
 clean:
        rm -vf *.h *.html *.xml *.wsdl glue2-copy.xsd
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 %.xml: %.xml.T
        rm -f $@

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index 05596e4..a21624e 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -85,7 +85,9 @@ install:
 
 clean:
        rm -rvf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo *.nsmap soap_version.h ${CEXAMPLES} ${TESTS}
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 LB.xh: ws_typemap.dat ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl
        ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}${prefix}/share/wsdl/glite-lb -o $@ ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl
@@ -95,4 +97,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
+.PHONY: default all check stage install clean distclean

diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile
index 0602341..ef25e74 100644 (file)
--- a/org.glite.lb.yaim/Makefile
+++ b/org.glite.lb.yaim/Makefile
@@ -51,6 +51,8 @@ stage:
 check:
 
 clean:
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/ ${FILES}
 
-.PHONY: default all check install stage clean
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
+.PHONY: default all check install stage clean distclean

diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index 4002576..3876431 100644 (file)
--- a/org.glite.lbjp-common.db/Makefile
+++ b/org.glite.lbjp-common.db/Makefile
@@ -176,9 +176,11 @@ install: all
 
 clean:
        rm -rvf *.o *.lo *.loT .libs lib* *.c *.h *.dox C/ CPP/
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
        rm -rvf db_expire db_test db_test_mysql db_test_psql timezone
 
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
 db-mysql.o db-mysql.lo: db-mysql.c
        ${COMPILE} ${MYSQL_CPPFLAGS} -c $<
 
@@ -203,4 +205,4 @@ db_test_mysql.lo: libglite_lbu_dbtest.la db.h db-int.h db_test.c
 db-mysql.lo: db-mysql.c db-int.h db.h
 db-pg.lo: db-pg.c db-int.h db.h
 
-.PHONY: default all compile check examples doc stage dist distsrc distbin install clean test_coverage check_soname
+.PHONY: default all compile check examples doc stage dist distsrc distbin install clean test_coverage check_soname distclean

diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile
index 50b0b27..84db12a 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/Makefile
+++ b/org.glite.lbjp-common.gsoap-plugin/Makefile
@@ -339,11 +339,13 @@ 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 rpmbuild/ RPMS/ tgz/ debian/
        for v in ${gsoap_versions_noflavours} ${gsoap_versions_flavours}; do \
                rm -rvf `echo $$v | tr -d .`; \
        done
 
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
 %.c.o: %.c
        ${COMPILE} ${GSOAP_DEFAULT_CFLAGS} -o $@ -c $<
 

diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 87fce4d..b46a82d 100644 (file)
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -158,7 +158,9 @@ install:
 
 clean:
        rm -rf *.o *.lo *.a *.la .libs test_gss
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec 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 552b366..88de0d8 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/Makefile
+++ b/org.glite.lbjp-common.jp-interface/Makefile
@@ -102,10 +102,12 @@ install:
 
 clean:
        rm -rvf *.o *.lo .libs lib*
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
        rm -vf type_test type_test.xml
        rm -f glite jp
 
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
 %.thr.lo: %.c
        ${COMPILE} -o $@ -c $<
 

diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index f41d7af..a4f767f 100644 (file)
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -78,9 +78,11 @@ install: compile
 
 clean:
        rm -rvf *.o *.lo .libs lib*
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
        rm -rvf test
 
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
 check: test
        LOG4C_RCPATH=${top_srcdir}/tests ./test
 

diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile
index 27de2a6..6f4b81c 100644 (file)
--- a/org.glite.lbjp-common.maildir/Makefile
+++ b/org.glite.lbjp-common.maildir/Makefile
@@ -94,11 +94,13 @@ install: all
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 %.o %.lo: %.c
        ${COMPILE} -c $<
 
 maildir.lo: maildir.c maildir.h
 
-.PHONY: default all compile check examples doc stage dist distsrc distbin install clean test_coverage
+.PHONY: default all compile check examples doc stage dist distsrc distbin install clean distclean test_coverage

diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile
index 4746115..c2b75bf 100644 (file)
--- a/org.glite.lbjp-common.server-bones/Makefile
+++ b/org.glite.lbjp-common.server-bones/Makefile
@@ -92,7 +92,9 @@ install:
 
 clean:
        rm -rvf *.o *.lo .libs lib* srv_example cnt_example
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
+
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
 
 %.o %.lo: %.c
        ${COMPILE} -c $<

diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index 9af068f..dcd52ef 100644 (file)
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -109,7 +109,9 @@ install: all
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
        rm -vf trio_test
-       rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/
        
+distclean:
+       rm -rvf Makefile.inc *.spec debian/
+
 %.o: %.c
        ${COMPILE} ${CFLAGS} -c $<