From 97d00f91856fe80acaa4138dd1d68b778988e5ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 18 Jan 2013 14:49:11 +0000 Subject: [PATCH] Merge from brach 3.2 to HEAD, take 6. --- org.glite.jobid.api-c/Makefile | 2 +- org.glite.jobid.api-cpp/Makefile | 2 +- org.glite.jobid.api-java/Makefile | 2 +- org.glite.lb.client-java/Makefile | 2 +- org.glite.lb.client/Makefile | 2 +- org.glite.lb.common/Makefile | 2 +- org.glite.lb.doc/Makefile | 2 +- org.glite.lb.doc/src/LBAG-Installation.tex | 7 ++++--- org.glite.lb.doc/src/LBUG-Troubleshooting.tex | 2 +- org.glite.lb.emi-lb/Makefile | 2 +- org.glite.lb.harvester/Makefile | 2 +- org.glite.lb.logger-msg/Makefile | 4 ++-- org.glite.lb.logger-msg/examples/cmsclient.cpp | 2 +- org.glite.lb.logger/Makefile | 2 +- org.glite.lb.server/Makefile | 2 +- org.glite.lb.server/config/glite-lb-proxy-purge.cron | 2 +- org.glite.lb.server/config/glite-lb-server-purge.cron | 2 +- org.glite.lb.server/config/setup | 19 +++++++++++++------ org.glite.lb.server/src/export.sh.in | 10 ++++++++++ org.glite.lb.state-machine/Makefile | 2 +- org.glite.lb.types/Makefile | 2 +- org.glite.lb.ws-interface/Makefile | 2 +- org.glite.lb.ws-test/Makefile | 2 +- org.glite.lb.yaim/Makefile | 2 +- org.glite.lb.yaim/config/functions/config_glite_lb.in | 18 ++++++++++++++++++ org.glite.lbjp-common.db/Makefile | 2 +- org.glite.lbjp-common.gsoap-plugin/Makefile | 2 +- org.glite.lbjp-common.gss/Makefile | 2 +- org.glite.lbjp-common.jp-interface/Makefile | 2 +- org.glite.lbjp-common.log/Makefile | 2 +- org.glite.lbjp-common.maildir/Makefile | 2 +- org.glite.lbjp-common.server-bones/Makefile | 2 +- org.glite.lbjp-common.trio/Makefile | 2 +- 33 files changed, 75 insertions(+), 39 deletions(-) diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile index 4b2721b..1f3616b 100644 --- a/org.glite.jobid.api-c/Makefile +++ b/org.glite.jobid.api-c/Makefile @@ -80,7 +80,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ stage: $(MAKE) install PREFIX=${stagedir} diff --git a/org.glite.jobid.api-cpp/Makefile b/org.glite.jobid.api-cpp/Makefile index f543e75..bd9aa9c 100644 --- a/org.glite.jobid.api-cpp/Makefile +++ b/org.glite.jobid.api-cpp/Makefile @@ -34,7 +34,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec 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 4373c8d..7685d73 100644 --- a/org.glite.jobid.api-java/Makefile +++ b/org.glite.jobid.api-java/Makefile @@ -34,6 +34,6 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ .PHONY: default all compile stage install check clean distclean dist distcheck diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index 08f6485..84712cd 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -123,6 +123,6 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ .PHONY: default 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 2d4727c..6514dd1 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -401,7 +401,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ check_version: ${CHECK_VERSION} ${stagedir}${prefix}/include/glite/lb/common_version.h diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 199e024..ab9b49c 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -264,7 +264,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ test_query_rec.o: query_rec.c ${COMPILE} ${CFLAGS} -DGLITE_LB_QUERY_REC_TEST -c $< -o $@ diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile index 42615af..7bfa951 100644 --- a/org.glite.lb.doc/Makefile +++ b/org.glite.lb.doc/Makefile @@ -86,7 +86,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ # dependencies: diff --git a/org.glite.lb.doc/src/LBAG-Installation.tex b/org.glite.lb.doc/src/LBAG-Installation.tex index 6f6f2aa..ccd317c 100644 --- a/org.glite.lb.doc/src/LBAG-Installation.tex +++ b/org.glite.lb.doc/src/LBAG-Installation.tex @@ -246,11 +246,12 @@ According to local retention policy you may want to use different purge timeouts Authorization: \begin{itemize} -\item \texttt{GLITE\_LB\_SUPER\_USERS} -- additional super-users (default: empty)\footnote{The use of this parameter is a FAQ. See section \ref{FAQ:WMS_superusers}.} +\item \texttt{GLITE\_LB\_SUPER\_USERS} -- additional DNs of super-users (default: empty)\footnote{The use of this parameter is a FAQ. See section \ref{FAQ:WMS_superusers}.} \item \texttt{GLITE\_LB\_WMS\_DN} -- DNs of WMS servers (default: empty)\footnotemark[\thefootnote] \item \texttt{GLITE\_LB\_RTM\_DN} -- DNs using to get notifications from \LB server\\ -(default: \texttt{heppc24.hep.ph.ic.ac.uk} machine certificate) -\item \texttt{GLITE\_LB\_AUTHZ\_} -- more detailed tuning of access grants, see Section~\ref{inst:authz} (default: empty, '\texttt{.*}' for logging and job registrations) +(default: \texttt{rtmsrv00.hep.ph.ic.ac.uk} machine certificate) +\item \texttt{GLITE\_LB\_AUTHZ\_} -- more detailed tuning of access grants using certificate DNs, see Section~\ref{inst:authz} (default: empty, '\texttt{.*}' for logging and job registrations) +\item \texttt{GLITE\_LB\_AUTHZ\_\_FQAN} -- more detailed tuning of access grants using VOMS FQANs, see Section~\ref{inst:authz} (default: empty) \end{itemize} Additional helper or legacy parameters: diff --git a/org.glite.lb.doc/src/LBUG-Troubleshooting.tex b/org.glite.lb.doc/src/LBUG-Troubleshooting.tex index 50994c2..8d6465f 100644 --- a/org.glite.lb.doc/src/LBUG-Troubleshooting.tex +++ b/org.glite.lb.doc/src/LBUG-Troubleshooting.tex @@ -25,7 +25,7 @@ Apparent software bugs are tracked in Savannah at \url{https://savannah.cern.ch/bugs/?func=additem&group=jra1mdw} \end{center} -When submitting a \LB spcecific problem/bug, the following information might be useful: +When submitting a \LB specific problem/bug, the following information might be useful: \begin{itemize} \item version of software used (all \verb'glite-lb-*' packages installed at your site) \item description of the problem, the \verb'jobId', addresses of all relevant diff --git a/org.glite.lb.emi-lb/Makefile b/org.glite.lb.emi-lb/Makefile index e04ffe5..37824af 100644 --- a/org.glite.lb.emi-lb/Makefile +++ b/org.glite.lb.emi-lb/Makefile @@ -27,6 +27,6 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ .PHONY: default all check install stage clean distclean dist distcheck diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile index e2e6da7..cc6d8f6 100644 --- a/org.glite.lb.harvester/Makefile +++ b/org.glite.lb.harvester/Makefile @@ -116,7 +116,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ harvester: harvester.o ${LINK} -o $@ $+ ${LIBS} diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile index 2fc8df5..1e7d2e1 100644 --- a/org.glite.lb.logger-msg/Makefile +++ b/org.glite.lb.logger-msg/Makefile @@ -146,6 +146,6 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ -.PHONY: default all compile man stage check install clean distclean dist distcheck +.PHONY: default all compile man stage check install clean dist distclean distcheck diff --git a/org.glite.lb.logger-msg/examples/cmsclient.cpp b/org.glite.lb.logger-msg/examples/cmsclient.cpp index 7b560db..2160272 100644 --- a/org.glite.lb.logger-msg/examples/cmsclient.cpp +++ b/org.glite.lb.logger-msg/examples/cmsclient.cpp @@ -79,7 +79,7 @@ public: this->clientAck = clientAck; } - virtual ~SimpleAsyncConsumer() throw(){ + virtual ~SimpleAsyncConsumer() throw() { this->cleanup(); } diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 0ab0db8..e942401 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -285,6 +285,6 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ .PHONY: default all compile man stage check install clean distclean dist distcheck diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index f0d55ef..41f402f 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -484,7 +484,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ %.c: %.c.T rm -f $@ diff --git a/org.glite.lb.server/config/glite-lb-proxy-purge.cron b/org.glite.lb.server/config/glite-lb-proxy-purge.cron index 0c522db..bcdb6eb 100644 --- a/org.glite.lb.server/config/glite-lb-proxy-purge.cron +++ b/org.glite.lb.server/config/glite-lb-proxy-purge.cron @@ -1 +1 @@ -31 1 * * * glite ( export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; export GLITE_LB_PURGE_OTHER_OPTIONS="$GLITE_LB_PURGE_OTHER_OPTIONS -x"; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export: "; @glite_prefix@/sbin/glite-lb-export ) >> /var/log/glite/glite-lb-server-purge-proxy.log 2>&1 +31 1 * * * glite ( export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export: "; @glite_prefix@/sbin/glite-lb-export proxy ) >> /var/log/glite/glite-lb-server-purge-proxy.log 2>&1 diff --git a/org.glite.lb.server/config/glite-lb-server-purge.cron b/org.glite.lb.server/config/glite-lb-server-purge.cron index a393f36..50b43bb 100644 --- a/org.glite.lb.server/config/glite-lb-server-purge.cron +++ b/org.glite.lb.server/config/glite-lb-server-purge.cron @@ -1 +1 @@ -1 1 * * * glite ( export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export: "; @glite_prefix@/sbin/glite-lb-export ) >> /var/log/glite/glite-lb-server-purge.log 2>&1 +1 1 * * * glite ( export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export: "; @glite_prefix@/sbin/glite-lb-export server ) >> /var/log/glite/glite-lb-server-purge.log 2>&1 diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup index 7f937c5..fbbd8dd 100755 --- a/org.glite.lb.server/config/setup +++ b/org.glite.lb.server/config/setup @@ -64,6 +64,7 @@ resource "LB" { EOF for section in ADMIN_ACCESS STATUS_FOR_MONITORING GET_STATISTICS REGISTER_JOBS READ_ALL PURGE GRANT_OWNERSHIP LOG_WMS_EVENTS LOG_CE_EVENTS LOG_GENERAL_EVENTS; do eval value=\"$`echo GLITE_LB_AUTHZ_$section`\" + eval value_fqan=\"$`echo GLITE_LB_AUTHZ_${section}_FQAN`\" case "$section" in ADMIN_ACCESS) value="$value,$superusers" ;; GET_STATISTICS) value="$value,$wms" ;; @@ -72,11 +73,15 @@ EOF LOG_WMS_EVENTS) value="$value,$wms" ;; esac value="`echo \"$value\" | tr ',' '\n' | grep -v ^$ | sed 's/\(.*\)/\trule permit {\n\t\tsubject = \"\1\"\n\t}/'`" + value_fqan="`echo \"$value_fqan\" | tr ',' '\n' | grep -v ^$ | sed 's/\(.*\)/\trule permit {\n\t\tfqan = \"\1\"\n\t}/'`" + if test -n "$value"; then value="$value +"; fi + if test -n "$value_fqan"; then value_fqan="$value_fqan +"; fi cat <> "$authconf".new action "$section" { -$value -} +$value$value_fqan} EOF done cat <> "$authconf".new @@ -581,10 +586,12 @@ fi if test "$setup_upgrade" = "1"; then # upgrade from L&B <= 3.1.1 # (legacy start-up stuff) - if test -f @glite_etc@/gLiteservice; then - grep -v 'glite-lb-bkserverd' @glite_etc@/gLiteservice > /tmp/gLiteservice - grep -v 'glite-lb-locallogger' @glite_etc@/gLiteservice > /tmp/gLiteservice - mv /tmp/gLiteservice @glite_etc@/gLiteservice + if test -f @glite_etc@/gLiteservices; then + grep -v 'glite-lb-' @glite_etc@/gLiteservices > /tmp/gLiteservices + mv /tmp/gLiteservices @glite_etc@/gLiteservices + if ! test -s @glite_etc@/gLiteservices; then + rm -f @glite_etc@/gLiteservices + fi fi # (old crons) rm -fv /etc/cron.d/glite-lb-purge.cron /etc/logrotate.d/lb-purger /etc/logrotate.d/lb-lcas diff --git a/org.glite.lb.server/src/export.sh.in b/org.glite.lb.server/src/export.sh.in index 13bb563..69bb883 100644 --- a/org.glite.lb.server/src/export.sh.in +++ b/org.glite.lb.server/src/export.sh.in @@ -31,6 +31,16 @@ GLITE_HOST_KEY=${GLITE_HOST_KEY:-"$GLITE_HOME/.certs/hostkey.pem"} #autodetect the prefix PREFIX=${GLITE_LOCATION:-`dirname $0`/..} +PURGE_TYPE=${1:-server} + +if [ "$GLITE_LB_TYPE" != "both" -a "$PURGE_TYPE" != "$GLITE_LB_TYPE" ]; then + echo "No $PURGE_TYPE purge on L&B $GLITE_LB_TYPE" + exit 0 +fi + +if [ "$PURGE_TYPE" = "proxy" ]; then + GLITE_LB_PURGE_OTHER_OPTIONS="$GLITE_LB_PURGE_OTHER_OPTIONS -x" +fi if [ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] ;then creds="-c '$GLITE_HOST_CERT' -k '$GLITE_HOST_KEY'" diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index 86ba12c..44443c0 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -125,7 +125,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ check: @echo No tests yet diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile index f8a2bc3..7718870 100644 --- a/org.glite.lb.types/Makefile +++ b/org.glite.lb.types/Makefile @@ -51,7 +51,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ check: diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile index 1e61054..3cc494c 100644 --- a/org.glite.lb.ws-interface/Makefile +++ b/org.glite.lb.ws-interface/Makefile @@ -70,7 +70,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog 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 c957a65..d2048cb 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -100,7 +100,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog 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 diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile index 707ff8b..6311ec7 100644 --- a/org.glite.lb.yaim/Makefile +++ b/org.glite.lb.yaim/Makefile @@ -65,6 +65,6 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ .PHONY: default all check install stage clean distclean dist distcheck diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb.in b/org.glite.lb.yaim/config/functions/config_glite_lb.in index 07864a0..34b2c39 100644 --- a/org.glite.lb.yaim/config/functions/config_glite_lb.in +++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in @@ -150,6 +150,24 @@ function config_glite_lb() { return 1 fi + # with YAIM let's use only the /etc/init.d/gLite startup + if egrep -i "Debian|Ubuntu" /etc/issue >/dev/null; then + update-rc.d glite-lb-bkserverd disable + update-rc.d glite-lb-locallogger disable + update-rc.d glite-lb-harvester disable + else + /sbin/chkconfig glite-lb-bkserverd off + /sbin/chkconfig glite-lb-locallogger off + /sbin/chkconfig glite-lb-harvester off + fi + grep -v 'glite-lb-' @glite_etc@/gLiteservices 2>/dev/null > /tmp/gLiteservices + mv /tmp/gLiteservices @glite_etc@/gLiteservices + echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd" >> @glite_etc@/gLiteservices + echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-locallogger" >> @glite_etc@/gLiteservices + if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then + echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-harvester" >> @glite_etc@/gLiteservices + fi + # set mysql password set_mysql_passwd || return 1 # the function uses $MYSQL_PASSWORD diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile index db058a7..69119d6 100644 --- a/org.glite.lbjp-common.db/Makefile +++ b/org.glite.lbjp-common.db/Makefile @@ -147,7 +147,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ db-mysql.o db-mysql.lo: db-mysql.c ${COMPILE} ${MYSQL_CFLAGS} -c $< diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile index 72e6708..70b6043 100644 --- a/org.glite.lbjp-common.gsoap-plugin/Makefile +++ b/org.glite.lbjp-common.gsoap-plugin/Makefile @@ -361,7 +361,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog 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 c2ef2f7..f6c3a94 100644 --- a/org.glite.lbjp-common.gss/Makefile +++ b/org.glite.lbjp-common.gss/Makefile @@ -205,7 +205,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ %.o: %.c ${COMPILE} ${GSSAPI_NOTHR_INC} ${LIBCARES_CFLAGS} -o $@ -c $< diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile index a9e964b..23d1f7a 100644 --- a/org.glite.lbjp-common.jp-interface/Makefile +++ b/org.glite.lbjp-common.jp-interface/Makefile @@ -111,7 +111,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog 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 489068c..ef07d12 100644 --- a/org.glite.lbjp-common.log/Makefile +++ b/org.glite.lbjp-common.log/Makefile @@ -90,7 +90,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog 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 40de295..98717ae 100644 --- a/org.glite.lbjp-common.maildir/Makefile +++ b/org.glite.lbjp-common.maildir/Makefile @@ -100,7 +100,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec 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 c60a1c7..575b105 100644 --- a/org.glite.lbjp-common.server-bones/Makefile +++ b/org.glite.lbjp-common.server-bones/Makefile @@ -105,7 +105,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog 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 2baa2b9..965235d 100644 --- a/org.glite.lbjp-common.trio/Makefile +++ b/org.glite.lbjp-common.trio/Makefile @@ -111,7 +111,7 @@ clean: rm -rvf dist ${package}-*.tar.gz distclean: - rm -rvf Makefile.inc *.spec debian/ + rm -rvf project/changelog Makefile.inc *.spec debian/ %.lo %.o: %.c ${COMPILE} ${CFLAGS} -c $< -- 1.8.2.3